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/action.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/action.py')
| -rw-r--r-- | layman/action.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/layman/action.py b/layman/action.py index 6349814..323d706 100644 --- a/layman/action.py +++ b/layman/action.py @@ -113,12 +113,14 @@ class Sync: for i in self.selection: ordb = self.rdb.select(i) odb = self.db.select(i) - if ordb and odb and ordb.src != odb.src: + current_src = odb.sources[0].src + available_srcs = set(e.src for e in ordb.sources) + if ordb and odb and not current_src in available_srcs: warnings.append( 'The source of the overlay "' + i + '" seems to have c' - 'hanged. You currently sync from "' + odb.src + '" whi' - 'le the global layman list reports "' + ordb.src + '" ' - 'as correct location. Please consider removing and rea' + 'hanged. You currently sync from "' + current_src + '" whi' + 'le the global layman list reports "' + '" and "'.join(available_srcs) + '" ' + 'as correct location(s). Please consider removing and rea' 'dding the overlay!') try: |