Goes from branch to branches - refactoring

2 files changed, 6 insertions, 6 deletions

diff --git a/modules/darcs.py b/modules/darcs.py
index 4c150b0..5ac1c9f 100644
--- a/modules/darcs.py
+++ b/modules/darcs.py
@@ -48,7 +48,7 @@ class Darcs(RevisionControl):
             self.cfg['vc_url'] = url
             self.cfg['hackage_name'] = tgt
             self.cfg['source'] = '.'
-            with pwd(self.branch_dir):
+            with pwd(self.branches_dir):
                 self.get(self.dir, 'orig')
             self.set_current_src()
             
@@ -142,18 +142,18 @@ class Darcs(RevisionControl):
             log.debug('doing head')
             self.cfg['source'] = '.'
         elif len(args) == 2 and args[0] == 'branch':
-            self.cfg['source'] = join(self.branch, args[1])
+            self.cfg['source'] = join(self.branches, args[1])
         else:
             log.debug('creating new branch')
             index = str(hash(args))
-            index_dir = join(self.branch, index)
+            index_dir = join(self.branches, index)
             with pwd(self.dir):
                 if not exists(index_dir):
                     log.debug('index dir should be ' + index_dir)
                     self.get(self.source(), index_dir, *args)
                 self.cfg['source'] = index_dir
             if branch_name:
-                with pwd(self.branch_dir):
+                with pwd(self.branches_dir):
                     self.get(index, branch_name)
         self.set_current_src()
 
diff --git a/modules/packagesource.py b/modules/packagesource.py
index b98f21e..d70ddd9 100644
--- a/modules/packagesource.py
+++ b/modules/packagesource.py
@@ -30,7 +30,7 @@ class PackageSource(Directory):
         super(PackageSource, self).make_dir(dir)
         with pwd(dir):
             makedirs(self.pkg_src)
-            makedirs(self.branch)
+            makedirs(self.branches)
 
     @property
     def pkg_src(self):
@@ -78,4 +78,4 @@ class PackageSource(Directory):
         raise NotImplementedError
 
     def branch_dir(self, *args):
-        return join(self.branch_dir, self.branch(*args))
+        return join(self.branches_dir, self.branch(*args))