From cc5e2028c39ec0239e112d0152b906657f86b170 Mon Sep 17 00:00:00 2001
From: Mykyta Holubakha <hilobakho@gmail.com>
Date: Fri, 2 Jun 2017 22:42:22 +0300
Subject: Fix portage repo initialization

---
 pomu/repo/init.py | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/pomu/repo/init.py b/pomu/repo/init.py
index 19ac289..1f56f02 100644
--- a/pomu/repo/init.py
+++ b/pomu/repo/init.py
@@ -7,7 +7,7 @@ import portage
 
 from pomu.util.result import Result, ResultException
 
-def init_plain_repo(create, repo_path):
+def init_plain_repo(create, repo_path, name=None): #name might be extraneous
     """Initialize a plain repository"""
     if not repo_path:
         return Result.Err('repository path required')
@@ -20,7 +20,7 @@ def init_plain_repo(create, repo_path):
             return Result.Err('you do not have enough permissions to create the git repository')
         Repo.init(repo_path)
         try:
-            return Result.Ok(init_pomu(repo_path).unwrap())
+            return Result.Ok(init_new(repo_path).unwrap())
         except ResultException as e:
             rmtree(repo_path)
             return Result.Err(str(e))
@@ -43,15 +43,15 @@ def init_portage_repo(create, repo, repo_dir):
         except PermissionError:
             return Result.Err('you do not have enough permissions to create the git repository')
         try:
-            with open(path.join(portage.root, '/etc/portage/repos.conf', 'pomu.conf'), 'a') as f:
+            with open(path.join(portage.root, 'etc/portage/repos.conf', 'pomu.conf'), 'a') as f:
                 f.write('[' + repo + ']' + '\n')
                 f.write('location = ' + repo_path + '\n')
         except PermissionError:
             rmtree(repo_path)
-            return Result.Error('you do not have enough permissions to setup a portage repo')
+            return Result.Err('you do not have enough permissions to setup a portage repo')
         Repo.init(repo_path)
         try:
-            return Result.Ok(init_pomu(repo_path).unwrap())
+            return Result.Ok(init_new(repo_path, repo).unwrap())
         except ResultException as e:
             rmtree(repo_path)
             return Result.Err(str(e))
@@ -60,13 +60,25 @@ def init_portage_repo(create, repo, repo_dir):
             return Result.Err('repository not found')
         return init_pomu(rsets.prepos[repo], repo)
 
-def init_pomu(repo_path, name=''):
+def init_new(repo_path, name=None):
+    """Initialize a newly created repository (metadata/layout.conf and pomu)"""
+    cnf = path.join(repo_path, 'metadata', 'layout.conf')
+    if not path.isfile(cnf):
+        try:
+            makedirs(path.join(repo_path, 'metadata'))
+            with open(cnf, 'w') as f:
+                f.write('masters = gentoo\n')
+        except PermissionError:
+            return Result.Err('you do not have enough permissions to modify the repo')
+    return init_pomu(repo_path, name)
+
+def init_pomu(repo_path, name=None):
     """Initialise pomu for a repository"""
     pomu_path = path.join(repo_path, 'metadata', 'pomu')
     if not path.isdir(path.join(repo_path, '.git')):
         return Result.Err('target repository should be a git repo')
     if path.isdir(pomu_path):
-        return Result.Ok('Repository ' + name + ' already initialized')
+        return Result.Ok('Repository ' + name if name else 'at {}'.format(repo_path) + ' already initialized')
     r = Repo(repo_path)
     try:
         makedirs(pomu_path)
-- 
cgit v1.2.3-65-gdbad