diff options
-rw-r--r-- | modules/haskellport.py | 6 | ||||
-rw-r--r-- | modules/package.py | 2 | ||||
-rw-r--r-- | modules/port.py | 13 |
3 files changed, 12 insertions, 9 deletions
diff --git a/modules/haskellport.py b/modules/haskellport.py index 1121dab..a7c2866 100644 --- a/modules/haskellport.py +++ b/modules/haskellport.py @@ -17,13 +17,9 @@ # from __future__ import with_statement -from os import getcwd - -from base.base import log -from base.exceptions import ExecutionException -from base.factories import DirFactory from base.util import pwd +from modules.cabal import Cabal from modules.darcs import Darcs from modules.hackage import Hackage from modules.port import Port diff --git a/modules/package.py b/modules/package.py index 4fb1605..6ad7ebf 100644 --- a/modules/package.py +++ b/modules/package.py @@ -23,7 +23,7 @@ from os.path import basename, abspath from base.base import log from base.factories import DirFactory from base.exceptions import ExecutionException -from base.util import pwd, copy, move, symlink +from base.util import pwd, copy, move, symlink, rm from base.profiles import ver_rel, name from modules.directory import Directory diff --git a/modules/port.py b/modules/port.py index d6edcdb..dd76c0f 100644 --- a/modules/port.py +++ b/modules/port.py @@ -15,6 +15,14 @@ # # Authors: Yaakov M. Nemoy <ynemoy@redhat.com> # +from __future__ import with_statement + +from os import getcwd + +from base.base import log +from base.exceptions import ExecutionException +from base.factories import DirFactory +from base.util import pwd from base.module import Module @@ -40,7 +48,6 @@ class Port(Module): if not package: package = getcwd() self.pkg = DirFactory(package) - self.hackage = Hackage() def add_sourceball(self, sourceball): '''copies a tarball into the package @@ -104,8 +111,8 @@ class Port(Module): def install_latest(self, pkg, target='home', *args): '''get and install the latest version of a package from hackage''' - ver = self.hackage.latest_version(pkg) - self.install_from_hackage(pkg, ver, target, *args) + ver = self.fetcher().latest_version(pkg) + self.install_from_release(pkg, ver, target, *args) def add_upstream(self, pkg, tgt=None, *args): if not tgt: |