Random bugfixes

makes it work
gets rid of _type madness
fixes imports
fixes random function signatures
inserts a bloody stupid easter egg hack
floats on a wooden raft

7 files changed, 16 insertions, 13 deletions

diff --git a/modules/build.py b/modules/build.py
index 93b2056..338f635 100644
--- a/modules/build.py
+++ b/modules/build.py
@@ -24,21 +24,20 @@ from os import listdir, getcwd, walk
 from subprocess import Popen
 
 from base.base import log
+from base.dirfactory import DirFactory
+from base.exceptions import ExecutionException
 from base.module import Module
+from base.profiles import dir_defines, join_defines, dist_defines, Profile
 from base.util import pwd, copy, symlink, move, log_file
-from base.exceptions import ExecutionException
 from base.vars import FEDORA_DIR
-from base.profiles import dir_defines, join_defines, dist_defines, Profile
 
 from modules.directory import Directory
-from modules.dirfactory import DirFactory
 from modules.package import Package
 from modules.profile import Profile
 
 class Build(Directory):
     '''A wrapper around rpmbuild functions
     '''
-    _type = 'build'
     def setup_source(self, package):
         '''Given a package, set's it up in the buildroot for being built with rpmbuild
 
diff --git a/modules/cabal.py b/modules/cabal.py
index 59c8d48..842aaf7 100644
--- a/modules/cabal.py
+++ b/modules/cabal.py
@@ -27,12 +27,12 @@ from subprocess import Popen
 from urllib import urlopen, urlretrieve
 
 from base.base import log
-from base.module import Module
 from base.exceptions import ExecutionException
+from base.dirfactory import DirFactory
+from base.module import Module
 from base.util import pwd, one, log_file
 from base.vars import orig_src_dir, haskell_compiler
 
-from modules.dirfactory import DirFactory
 from modules.sourceball import SourceBall
 
 class Cabal(Module):
diff --git a/modules/darcs.py b/modules/darcs.py
index 943ebf0..2ca2f6c 100644
--- a/modules/darcs.py
+++ b/modules/darcs.py
@@ -35,7 +35,6 @@ date_re = re.compile(r'date=\'(\d*?)\'', re.MULTILINE)
 class Darcs(RevisionControl):
     '''manages single source packages where the primary source is darcs
     '''
-    _type = 'darcs'
     def __init__(self, name=None, url=None, *args):
         if url:
             #split chokes on URLs that end in a /
@@ -145,7 +144,7 @@ class Darcs(RevisionControl):
             date = date_re.search(change).groups()[0]
             self.cfg['head'] = (hash, date)
 
-    def set_cur_to(self, *args, branch_name=''):
+    def set_cur_to(self, branch_name='', *args):
         '''passes arbitrary args to darcs get and makes a branch out of it
 
         this is not really optimal, because it only does things temporary,
diff --git a/modules/mock.py b/modules/mock.py
index d7cf00d..9bd88e3 100644
--- a/modules/mock.py
+++ b/modules/mock.py
@@ -20,12 +20,12 @@ from __future__ import with_statement
 from subprocess import Popen
 
 from base.base import log
+from base.dirfactory import DirFactory
 from base.module import Module
 from base.profiles import ver_rel
 from base.util import pwd, log_file
 
 from modules.build import Build
-from modules.dirfactory import DirFactory
 from modules.package import Package
 from modules.profile import Profile
 
diff --git a/modules/packagesource.py b/modules/packagesource.py
index e6c8d99..244aac9 100644
--- a/modules/packagesource.py
+++ b/modules/packagesource.py
@@ -15,8 +15,14 @@
 #
 # Authors: Yaakov M. Nemoy <ynemoy@redhat.com>
 #
+from __future__ import with_statement
 
-from modules.directory import directory
+from os import makedirs
+from os.path import join
+
+from base.util import pwd
+
+from modules.directory import Directory
 
 class PackageSource(Directory):
 
@@ -24,6 +30,7 @@ class PackageSource(Directory):
         super(PackageSource, self).make_dir(dir)
         with pwd(dir):
             makedirs('.pkg_src')
+            makedirs(join('.pkg_src', 'branches'))
 
     @property
     def pkg_src(self):
diff --git a/modules/profile.py b/modules/profile.py
index dc4d44a..9d8ed86 100644
--- a/modules/profile.py
+++ b/modules/profile.py
@@ -28,7 +28,6 @@ from modules.directory import Directory
 
 class Profile(Directory):
     '''a profile module to resemble various architectures, branches, build targets, etc...'''
-    _type = 'profile'
     @property
     def dist(self):
         '''eg .fc7 or .olpc2
diff --git a/modules/sourceball.py b/modules/sourceball.py
index 60fee9f..a84a110 100644
--- a/modules/sourceball.py
+++ b/modules/sourceball.py
@@ -26,15 +26,14 @@ from subprocess import Popen, PIPE
 from tempfile import mkdtemp
 
 from base.base import log
+from base.dirfactory import DirFactory
 from base.exceptions import ExecutionException
 from base.util import pwd, copy, move
 
-from modules.dirfactory import DirFactory
 from modules.packagesource import PackageSource
 
 class SourceBall(PackageSource):
     '''a type of package that is a single sourceball, a spec file, and some patches'''
-    _type = 'sourceball'
     def __init__(self, name=None, tarball=''):
         if tarball:
             tmp_dir = mkdtemp()