diff options
author | dol-sen <brian.dolbec@gmail.com> | 2011-07-22 23:44:26 -0700 |
---|---|---|
committer | dol-sen <brian.dolbec@gmail.com> | 2011-07-22 23:44:26 -0700 |
commit | 0fde69e7ef993c3e5cca925cef35c8c895cfd834 (patch) | |
tree | 2b1a0d615c693ebfcaac7df73497640f9fb08acb | |
parent | 7fa3a45f35d8571e384f8648aed49384de0d8a4d (diff) | |
download | layman-0fde69e7ef993c3e5cca925cef35c8c895cfd834.tar.gz layman-0fde69e7ef993c3e5cca925cef35c8c895cfd834.tar.bz2 layman-0fde69e7ef993c3e5cca925cef35c8c895cfd834.zip |
fix undefined 'subpath', update tests
-rw-r--r-- | layman/overlays/cvs.py | 1 | ||||
-rw-r--r-- | layman/overlays/tar.py | 12 |
2 files changed, 9 insertions, 4 deletions
diff --git a/layman/overlays/cvs.py b/layman/overlays/cvs.py index c6660d0..83981e5 100644 --- a/layman/overlays/cvs.py +++ b/layman/overlays/cvs.py @@ -44,6 +44,7 @@ class CvsOverlay(OverlaySource): def __init__(self, parent, config, _location, ignore = 0, quiet = False): super(CvsOverlay, self).__init__(parent, config, _location, ignore, quiet) + self.subpath = None def __eq__(self, other): diff --git a/layman/overlays/tar.py b/layman/overlays/tar.py index e6c0d45..dc2234a 100644 --- a/layman/overlays/tar.py +++ b/layman/overlays/tar.py @@ -57,15 +57,18 @@ class TarOverlay(OverlaySource): >>> subpath = ET.Element('subpath') >>> subpath.text = 'layman-test' >>> repo[:] = [repo_name, desc, owner, source, subpath] - >>> config = {'tar_command':'/bin/tar', 'output': Message()} + >>> from layman.config import BareConfig + >>> config = BareConfig() >>> testdir = os.tmpnam() >>> os.mkdir(testdir) >>> from layman.overlays.overlay import Overlay >>> a = Overlay(config, repo, quiet=False) >>> config['output'].set_colorize(False) - >>> a.add(testdir) #doctest: +ELLIPSIS - * Running... # /bin/tar -v -x -f... - >>> sorted(os.listdir(testdir + '/dummy')) + >>> a.add(testdir) + 0 + >>> os.listdir(testdir + '/dummy/') + ['layman-test'] + >>> sorted(os.listdir(testdir + '/dummy/layman-test/')) ['app-admin', 'app-portage'] >>> shutil.rmtree(testdir) ''' @@ -79,6 +82,7 @@ class TarOverlay(OverlaySource): config, _location, ignore, quiet) self.output = config['output'] + self.subpath = None def __eq__(self, other): res = super(TarOverlay, self).__eq__(other) \ |