Fix multiple issues with packages and repositories

2 files changed, 5 insertions, 4 deletions

diff --git a/pomu/package.py b/pomu/package.py
index f3319f1..65c6d18 100644
--- a/pomu/package.py
+++ b/pomu/package.py
@@ -42,7 +42,7 @@ class Package():
             return d_path
 
     def read_path(self, d_path):
-        for wd, dirs, files in d_path:
+        for wd, dirs, files in os.walk(d_path):
             wd = self.strip_root(wd)
             self.files.extend([(wd, f) for f in files])
 
diff --git a/pomu/repo/repo.py b/pomu/repo/repo.py
index 1e384cd..f72b996 100644
--- a/pomu/repo/repo.py
+++ b/pomu/repo/repo.py
@@ -6,8 +6,8 @@ from git import Repo
 import portage
 
 class Repository():
-    def __init__(self, path):
-        if not pomu_status(path):
+    def __init__(self, root):
+        if not pomu_status(root):
             raise ValueError('This path is not a valid pomu repository')
         self.root = root
 
@@ -30,7 +30,8 @@ class Repository():
         r = self.repo
         for wd, f in package.files:
             dst = path.join(self.root, wd)
-            r.index.remove(path.join(package.root, wd, f)
+            r.index.remove(path.join(self.root, wd, f))
+            os.remove(path.join(self.root, wd, f))
             try:
                 rmdir(dst)
             except OSError: pass