Refactors things around using source directories as separate directories

1 files changed, 2 insertions, 26 deletions

diff --git a/modules/sourceball.py b/modules/sourceball.py
index d66277e..60fee9f 100644
--- a/modules/sourceball.py
+++ b/modules/sourceball.py
@@ -30,7 +30,7 @@ from base.exceptions import ExecutionException
 from base.util import pwd, copy, move
 
 from modules.dirfactory import DirFactory
-from modules.package import PackageSource
+from modules.packagesource import PackageSource
 
 class SourceBall(PackageSource):
     '''a type of package that is a single sourceball, a spec file, and some patches'''
@@ -58,27 +58,6 @@ class SourceBall(PackageSource):
                 move(join(tmp_dir, sourceball_name), sourceball_name)
         self.cfg['sourceball'] = sourceball_name
 
-    def make_dir(self, dir):
-        super(PackageSource, self).make_dir(dir)
-        with pwd(dir):
-            makedirs('.pkg_src')
-
-    @property
-    def branch(self):
-        return join('.pkg_src', 'branches')
-
-    @property
-    def branch_dir(self):
-        return join(self.dir, self.branch)
-
-    @property
-    def sourceball(self):
-        return self.cfg['sourceball']
-    
-    @property
-    def sourceball_loc(self):
-        return join(self.parent, self.sourceball)
-
     def orig_dir(self, dir):
         '''where is the original source kept
 
@@ -92,12 +71,9 @@ class SourceBall(PackageSource):
         you get the modified source
         '''
         if args[0] == 'orig':
-            return join(self.branch, self.orig_dir(self.name)))
+            return join(self.branch, self.orig_dir(self.name))
         else:
             return self.name
 
-    def source_dir(self, *args):
-        return join(self.dir, self.source(*args))
-
 
 __all__ = ['SourceBall']