summaryrefslogtreecommitdiffstats
path: root/modules/port.py
diff options
context:
space:
mode:
Diffstat (limited to 'modules/port.py')
-rw-r--r--modules/port.py15
1 files changed, 4 insertions, 11 deletions
diff --git a/modules/port.py b/modules/port.py
index dd76c0f..7277fa4 100644
--- a/modules/port.py
+++ b/modules/port.py
@@ -22,7 +22,7 @@ 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.util import pwd, close_later, close_all
from base.module import Module
@@ -44,7 +44,6 @@ class Port(Module):
raise NotImplementedError
def __init__(self, package=None):
- self._to_close = list()
if not package:
package = getcwd()
self.pkg = DirFactory(package)
@@ -59,7 +58,7 @@ class Port(Module):
pkg_src.set_buildsystem(self.builder._type)
name = pkg_src.name
self.pkg.add_source(name)
- return self.close_later(pkg_src)
+ return close_later(pkg_src)
def add_vcs(self, url, tgt, *args):
'''creates a darcs variant of a cabal package using darcs source
@@ -72,7 +71,7 @@ class Port(Module):
pkg_src.set_buildsystem(self.builder._type)
name = pkg_src.name
self.pkg.add_source(name)
- return self.close_later(pkg_src)
+ return close_later(pkg_src)
def install_sourceball(self, tarball, target='home', *args):
'''given a tarball, copy it in and install it
@@ -124,12 +123,6 @@ class Port(Module):
self.builder(pkg_src).install_source(target)
- def close_later(self, directory):
- if directory not in self._to_close:
- self._to_close.append(directory)
- return directory
-
def close(self):
- for directory in self._to_close:
- directory.close()
self.pkg.close()
+ close_all()