diff options
author | Sebastian Pipping <sebastian@pipping.org> | 2010-01-13 02:38:44 +0100 |
---|---|---|
committer | Sebastian Pipping <sebastian@pipping.org> | 2010-01-13 02:47:29 +0100 |
commit | 2a14ba6689f6104601533d0677fb9211a35c96e0 (patch) | |
tree | c51921ddd2e0885a3d599de6665d48a2fa849ae7 /layman/overlays/bzr.py | |
parent | 82643d91c7814033626885285ee51ac06e66cbe9 (diff) | |
download | layman-2a14ba6689f6104601533d0677fb9211a35c96e0.tar.gz layman-2a14ba6689f6104601533d0677fb9211a35c96e0.tar.bz2 layman-2a14ba6689f6104601533d0677fb9211a35c96e0.zip |
Add support for multiple sources per overlay
Diffstat (limited to 'layman/overlays/bzr.py')
-rw-r--r-- | layman/overlays/bzr.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/layman/overlays/bzr.py b/layman/overlays/bzr.py index 3f5a0c2..346f1a0 100644 --- a/layman/overlays/bzr.py +++ b/layman/overlays/bzr.py @@ -27,7 +27,6 @@ __version__ = "$Id: bzr.py 236 2006-09-05 20:39:37Z wrobel $" #------------------------------------------------------------------------------- from layman.utils import path -from layman.overlays.overlay import Overlay from layman.overlays.source import OverlaySource #=============================================================================== @@ -42,9 +41,9 @@ class BzrOverlay(OverlaySource): type = 'Bzr' type_key = 'bzr' - def __init__(self, xml, config, ignore = 0, quiet = False): + def __init__(self, parent, xml, config, _location, ignore = 0, quiet = False): - super(BzrOverlay, self).__init__(xml, config, ignore) + super(BzrOverlay, self).__init__(parent, xml, config, _location, ignore, quiet) def add(self, base, quiet = False): '''Add overlay.''' @@ -52,14 +51,14 @@ class BzrOverlay(OverlaySource): self.supported() return self.cmd(self.command() + ' get "' + self.src + '/" "' +\ - path([base, self.name]) + '"') + path([base, self.parent.name]) + '"') def sync(self, base, quiet = False): '''Sync overlay.''' self.supported() - return self.cmd('cd "' + path([base, self.name]) + '" && ' + \ + return self.cmd('cd "' + path([base, self.parent.name]) + '" && ' + \ self.command() + ' pull --overwrite "' + self.src \ + '"') |