diff options
| -rw-r--r-- | base/factories.py | 4 | ||||
| -rw-r--r-- | modules/buildsystem.py | 5 | ||||
| -rw-r--r-- | modules/cabal.py | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/base/factories.py b/base/factories.py index 98022fe..c69f230 100644 --- a/base/factories.py +++ b/base/factories.py @@ -27,7 +27,7 @@ from exceptions import ExecutionException directory_type = dict() -def register_dirfactory(cls, name): +def register_directory(cls, name): global directory_type directory_type[name] = cls @@ -78,4 +78,4 @@ def whatis_sysdir(dir): except KeyError, e: return 'directory' -__all__ = ['DirFactory', 'register'] +__all__ = ['DirFactory', 'BuildSystemFactory', 'register_directory', 'register_buildsystem'] diff --git a/modules/buildsystem.py b/modules/buildsystem.py index 5265101..1e0bd2d 100644 --- a/modules/buildsystem.py +++ b/modules/buildsystem.py @@ -16,6 +16,9 @@ # Authors: Yaakov M. Nemoy <ynemoy@redhat.com> # +import base.factories as factories + +from base.factories import DirFactory from base.module import Module class MetaBuildSystem(type): @@ -27,7 +30,7 @@ class MetaBuildSystem(type): class BuildSystem(Module): __metaclass__ = MetaBuildSystem def __init__(self, name): - if type(name) is string: + if type(name) is str: self.pkg_src = DirFactory(name) self.name = name else: diff --git a/modules/cabal.py b/modules/cabal.py index fc9bc4f..696e120 100644 --- a/modules/cabal.py +++ b/modules/cabal.py @@ -134,11 +134,12 @@ class Cabal(BuildSystem): self.install(orig) def gen_spec(self): - cabal_file = self.pkg_src.hackage_name + '.spec' + cabal_file = self.pkg_src.hackage_name + '.cabal' with pwd(self.pkg_src.pkg_src_dir): with log_file('cabal2spec.log') as c2s_log: with pwd(self.pkg_src.dir): cmd = ['cabal2spec', cabal_file] + log.debug(str(cmd)) p = Popen(cmd, stdout=c2s_log, stderr=c2s_log) log.info('Generating spec file for %s' % cabal_file) p.communicate() |