|
Line
Link Here
|
| 0 |
-- layman/action.py |
0 |
++ layman/action.py |
|
Lines 90-95
Link Here
|
| 90 |
|
90 |
|
| 91 |
self.rdb = RemoteDB(config) |
91 |
self.rdb = RemoteDB(config) |
| 92 |
|
92 |
|
|
|
93 |
self.quiet = config['quiet'] |
| 94 |
|
| 93 |
self.selection = config['sync'] |
95 |
self.selection = config['sync'] |
| 94 |
|
96 |
|
| 95 |
if config['sync_all'] or 'ALL' in self.selection: |
97 |
if config['sync_all'] or 'ALL' in self.selection: |
|
Lines 117-123
Link Here
|
| 117 |
'dding the overlay!') |
119 |
'dding the overlay!') |
| 118 |
|
120 |
|
| 119 |
try: |
121 |
try: |
| 120 |
self.db.sync(i) |
122 |
self.db.sync(i, self.quiet) |
| 121 |
success.append('Successfully synchronized overlay "' + i + '".') |
123 |
success.append('Successfully synchronized overlay "' + i + '".') |
| 122 |
except Exception, error: |
124 |
except Exception, error: |
| 123 |
warnings.append( |
125 |
warnings.append( |
|
Lines 154-159
Link Here
|
| 154 |
|
156 |
|
| 155 |
self.rdb = RemoteDB(config) |
157 |
self.rdb = RemoteDB(config) |
| 156 |
|
158 |
|
|
|
159 |
self.quiet = config['quiet'] |
| 160 |
|
| 157 |
self.selection = config['add'] |
161 |
self.selection = config['add'] |
| 158 |
|
162 |
|
| 159 |
enc = sys.getfilesystemencoding() |
163 |
enc = sys.getfilesystemencoding() |
|
Lines 176-182
Link Here
|
| 176 |
|
180 |
|
| 177 |
if overlay: |
181 |
if overlay: |
| 178 |
try: |
182 |
try: |
| 179 |
self.db.add(overlay) |
183 |
self.db.add(overlay, self.quiet) |
| 180 |
OUT.info('Successfully added overlay "' + i + '".', 2) |
184 |
OUT.info('Successfully added overlay "' + i + '".', 2) |
| 181 |
except Exception, error: |
185 |
except Exception, error: |
| 182 |
OUT.warn('Failed to add overlay "' + i + '".\nError was: ' |
186 |
OUT.warn('Failed to add overlay "' + i + '".\nError was: ' |
| 183 |
-- layman/db.py |
187 |
++ layman/db.py |
|
Lines 60-66
Link Here
|
| 60 |
|
60 |
|
| 61 |
OUT.debug('DB handler initiated', 6) |
61 |
OUT.debug('DB handler initiated', 6) |
| 62 |
|
62 |
|
| 63 |
def add(self, overlay): |
63 |
def add(self, overlay, quiet = False): |
| 64 |
''' |
64 |
''' |
| 65 |
Add an overlay to the local list of overlays. |
65 |
Add an overlay to the local list of overlays. |
| 66 |
|
66 |
|
|
Lines 106-112
Link Here
|
| 106 |
''' |
106 |
''' |
| 107 |
|
107 |
|
| 108 |
if overlay.name not in self.overlays.keys(): |
108 |
if overlay.name not in self.overlays.keys(): |
| 109 |
result = overlay.add(self.config['storage']) |
109 |
result = overlay.add(self.config['storage'], quiet) |
| 110 |
if result == 0: |
110 |
if result == 0: |
| 111 |
if 'priority' in self.config.keys(): |
111 |
if 'priority' in self.config.keys(): |
| 112 |
overlay.set_priority(self.config['priority']) |
112 |
overlay.set_priority(self.config['priority']) |
|
Lines 182-194
Link Here
|
| 182 |
else: |
182 |
else: |
| 183 |
raise Exception('No local overlay named "' + overlay.name + '"!') |
183 |
raise Exception('No local overlay named "' + overlay.name + '"!') |
| 184 |
|
184 |
|
| 185 |
def sync(self, overlay_name): |
185 |
def sync(self, overlay_name, quiet = False): |
| 186 |
'''Synchronize the given overlay.''' |
186 |
'''Synchronize the given overlay.''' |
| 187 |
|
187 |
|
| 188 |
overlay = self.select(overlay_name) |
188 |
overlay = self.select(overlay_name) |
| 189 |
|
189 |
|
| 190 |
if overlay: |
190 |
if overlay: |
| 191 |
result = overlay.sync(self.config['storage']) |
191 |
result = overlay.sync(self.config['storage'], quiet) |
| 192 |
if result: |
192 |
if result: |
| 193 |
raise Exception('Syncing overlay "' + overlay_name + |
193 |
raise Exception('Syncing overlay "' + overlay_name + |
| 194 |
'" returned status ' + str(result) + '!') |
194 |
'" returned status ' + str(result) + '!') |
| 195 |
-- layman/overlays/bzr.py |
195 |
++ layman/overlays/bzr.py |
|
Lines 42-48
Link Here
|
| 42 |
|
42 |
|
| 43 |
binary_command = '/usr/bin/bzr' |
43 |
binary_command = '/usr/bin/bzr' |
| 44 |
|
44 |
|
| 45 |
def add(self, base): |
45 |
def add(self, base, quiet = False): |
| 46 |
'''Add overlay.''' |
46 |
'''Add overlay.''' |
| 47 |
|
47 |
|
| 48 |
self.supported() |
48 |
self.supported() |
|
Lines 50-56
Link Here
|
| 50 |
return self.cmd(self.binary_command + ' get "' + self.src + '/" "' +\ |
50 |
return self.cmd(self.binary_command + ' get "' + self.src + '/" "' +\ |
| 51 |
path([base, self.name]) + '"') |
51 |
path([base, self.name]) + '"') |
| 52 |
|
52 |
|
| 53 |
def sync(self, base): |
53 |
def sync(self, base, quiet = False): |
| 54 |
'''Sync overlay.''' |
54 |
'''Sync overlay.''' |
| 55 |
|
55 |
|
| 56 |
self.supported() |
56 |
self.supported() |
| 57 |
-- layman/overlays/cvs.py |
57 |
++ layman/overlays/cvs.py |
|
Lines 49-70
Link Here
|
| 49 |
else: |
49 |
else: |
| 50 |
self.subpath = '' |
50 |
self.subpath = '' |
| 51 |
|
51 |
|
| 52 |
def add(self, base): |
52 |
def add(self, base, quiet = False): |
| 53 |
'''Add overlay.''' |
53 |
'''Add overlay.''' |
| 54 |
|
54 |
|
| 55 |
self.supported() |
55 |
self.supported() |
| 56 |
|
56 |
|
|
|
57 |
if quiet: |
| 58 |
quiet_option = ' -q' |
| 59 |
else: |
| 60 |
quiet_option = '' |
| 61 |
|
| 57 |
return self.cmd('cd "' + base + '" && CVSROOT="' + self.src + '" ' + |
62 |
return self.cmd('cd "' + base + '" && CVSROOT="' + self.src + '" ' + |
| 58 |
self.binary + ' co -d "' + self.name |
63 |
self.binary + quiet_option + ' co -d "' + self.name |
| 59 |
+ '" "' + self.subpath + '"' ) |
64 |
+ '" "' + self.subpath + '"' ) |
| 60 |
|
65 |
|
| 61 |
def sync(self, base): |
66 |
def sync(self, base, quiet = False): |
| 62 |
'''Sync overlay.''' |
67 |
'''Sync overlay.''' |
| 63 |
|
68 |
|
| 64 |
self.supported() |
69 |
self.supported() |
| 65 |
|
70 |
|
|
|
71 |
if quiet: |
| 72 |
quiet_option = ' -q' |
| 73 |
else: |
| 74 |
quiet_option = '' |
| 75 |
|
| 66 |
return self.cmd('cd "' + path([base, self.name]) + '" && ' + |
76 |
return self.cmd('cd "' + path([base, self.name]) + '" && ' + |
| 67 |
self.binary + ' update') |
77 |
self.binary + quiet_option + ' update') |
| 68 |
|
78 |
|
| 69 |
def supported(self): |
79 |
def supported(self): |
| 70 |
'''Overlay type supported?''' |
80 |
'''Overlay type supported?''' |
| 71 |
-- layman/overlays/darcs.py |
81 |
++ layman/overlays/darcs.py |
|
Lines 41-47
Link Here
|
| 41 |
|
41 |
|
| 42 |
binary_command = '/usr/bin/darcs' |
42 |
binary_command = '/usr/bin/darcs' |
| 43 |
|
43 |
|
| 44 |
def add(self, base): |
44 |
def add(self, base, quiet = False): |
| 45 |
'''Add overlay.''' |
45 |
'''Add overlay.''' |
| 46 |
|
46 |
|
| 47 |
self.supported() |
47 |
self.supported() |
|
Lines 49-55
Link Here
|
| 49 |
return self.cmd(self.binary_command + ' get --partial "' + self.src + |
49 |
return self.cmd(self.binary_command + ' get --partial "' + self.src + |
| 50 |
'/" "' + path([base, self.name]) + '"') |
50 |
'/" "' + path([base, self.name]) + '"') |
| 51 |
|
51 |
|
| 52 |
def sync(self, base): |
52 |
def sync(self, base, quiet = False): |
| 53 |
'''Sync overlay.''' |
53 |
'''Sync overlay.''' |
| 54 |
|
54 |
|
| 55 |
self.supported() |
55 |
self.supported() |
| 56 |
-- layman/overlays/git.py |
56 |
++ layman/overlays/git.py |
|
Lines 40-60
Link Here
|
| 40 |
|
40 |
|
| 41 |
binary_command = '/usr/bin/git' |
41 |
binary_command = '/usr/bin/git' |
| 42 |
|
42 |
|
| 43 |
def add(self, base): |
43 |
def add(self, base, quiet = False): |
| 44 |
'''Add overlay.''' |
44 |
'''Add overlay.''' |
| 45 |
|
45 |
|
| 46 |
self.supported() |
46 |
self.supported() |
| 47 |
|
47 |
|
| 48 |
return self.cmd(self.binary_command + ' clone "' + self.src + '/" "' |
48 |
if quiet: |
|
|
49 |
quiet_option = '-q ' |
| 50 |
else: |
| 51 |
quiet_option = '' |
| 52 |
|
| 53 |
return self.cmd(self.binary_command + ' clone ' + quiet_option + '"' + self.src + '/" "' |
| 49 |
+ path([base, self.name]) + '"') |
54 |
+ path([base, self.name]) + '"') |
| 50 |
|
55 |
|
| 51 |
def sync(self, base): |
56 |
def sync(self, base, quiet = False): |
| 52 |
'''Sync overlay.''' |
57 |
'''Sync overlay.''' |
| 53 |
|
58 |
|
| 54 |
self.supported() |
59 |
self.supported() |
| 55 |
|
60 |
|
|
|
61 |
if quiet: |
| 62 |
quiet_option = ' -q' |
| 63 |
else: |
| 64 |
quiet_option = '' |
| 65 |
|
| 56 |
return self.cmd('cd "' + path([base, self.name]) + '" && ' |
66 |
return self.cmd('cd "' + path([base, self.name]) + '" && ' |
| 57 |
+ self.binary_command + ' pull') |
67 |
+ self.binary_command + ' pull' + quiet_option) |
| 58 |
|
68 |
|
| 59 |
def supported(self): |
69 |
def supported(self): |
| 60 |
'''Overlay type supported?''' |
70 |
'''Overlay type supported?''' |
| 61 |
-- layman/overlays/mercurial.py |
71 |
++ layman/overlays/mercurial.py |
|
Lines 41-47
Link Here
|
| 41 |
|
41 |
|
| 42 |
binary_command = '/usr/bin/hg' |
42 |
binary_command = '/usr/bin/hg' |
| 43 |
|
43 |
|
| 44 |
def add(self, base): |
44 |
def add(self, base, quiet = False): |
| 45 |
'''Add overlay.''' |
45 |
'''Add overlay.''' |
| 46 |
|
46 |
|
| 47 |
self.supported() |
47 |
self.supported() |
|
Lines 49-55
Link Here
|
| 49 |
return self.cmd(self.binary_command + ' clone "' + self.src + '/" "' + |
49 |
return self.cmd(self.binary_command + ' clone "' + self.src + '/" "' + |
| 50 |
path([base, self.name]) + '"') |
50 |
path([base, self.name]) + '"') |
| 51 |
|
51 |
|
| 52 |
def sync(self, base): |
52 |
def sync(self, base, quiet = False): |
| 53 |
'''Sync overlay.''' |
53 |
'''Sync overlay.''' |
| 54 |
|
54 |
|
| 55 |
self.supported() |
55 |
self.supported() |
| 56 |
-- layman/overlays/overlay.py |
56 |
++ layman/overlays/overlay.py |
|
Lines 123-129
Link Here
|
| 123 |
|
123 |
|
| 124 |
return dict_to_node(self.data, document, 'overlay') |
124 |
return dict_to_node(self.data, document, 'overlay') |
| 125 |
|
125 |
|
| 126 |
def add(self, base): |
126 |
def add(self, base, quiet = False): |
| 127 |
'''Add the overlay.''' |
127 |
'''Add the overlay.''' |
| 128 |
|
128 |
|
| 129 |
mdir = path([base, self.name]) |
129 |
mdir = path([base, self.name]) |
|
Lines 134-140
Link Here
|
| 134 |
|
134 |
|
| 135 |
os.makedirs(mdir) |
135 |
os.makedirs(mdir) |
| 136 |
|
136 |
|
| 137 |
def sync(self, base): |
137 |
def sync(self, base, quiet = False): |
| 138 |
'''Sync the overlay.''' |
138 |
'''Sync the overlay.''' |
| 139 |
pass |
139 |
pass |
| 140 |
|
140 |
|
| 141 |
-- layman/overlays/rsync.py |
141 |
++ layman/overlays/rsync.py |
|
Lines 44-50
Link Here
|
| 44 |
'--timeout=180 --exclude="distfiles/*" --exclude="local/*" ' + \ |
44 |
'--timeout=180 --exclude="distfiles/*" --exclude="local/*" ' + \ |
| 45 |
'--exclude="packages/*" ' |
45 |
'--exclude="packages/*" ' |
| 46 |
|
46 |
|
| 47 |
def add(self, base): |
47 |
def add(self, base, quiet = False): |
| 48 |
'''Add overlay.''' |
48 |
'''Add overlay.''' |
| 49 |
|
49 |
|
| 50 |
self.supported() |
50 |
self.supported() |
|
Lines 53-64
Link Here
|
| 53 |
|
53 |
|
| 54 |
return self.sync(base) |
54 |
return self.sync(base) |
| 55 |
|
55 |
|
| 56 |
def sync(self, base): |
56 |
def sync(self, base, quiet = False): |
| 57 |
'''Sync overlay.''' |
57 |
'''Sync overlay.''' |
| 58 |
|
58 |
|
| 59 |
self.supported() |
59 |
self.supported() |
| 60 |
|
60 |
|
| 61 |
return self.cmd(self.base + '"' + self.src + '/" "' + |
61 |
if quiet: |
|
|
62 |
quiet_option = '-q ' |
| 63 |
else: |
| 64 |
quiet_option = '' |
| 65 |
|
| 66 |
return self.cmd(self.base + quiet_option + '"' + self.src + '/" "' + |
| 62 |
path([base, self.name]) + '"') |
67 |
path([base, self.name]) + '"') |
| 63 |
|
68 |
|
| 64 |
def supported(self): |
69 |
def supported(self): |
| 65 |
-- layman/overlays/svn.py |
70 |
++ layman/overlays/svn.py |
|
Lines 40-61
Link Here
|
| 40 |
|
40 |
|
| 41 |
binary = '/usr/bin/svn' |
41 |
binary = '/usr/bin/svn' |
| 42 |
|
42 |
|
| 43 |
def add(self, base): |
43 |
def add(self, base, quiet = False): |
| 44 |
'''Add overlay.''' |
44 |
'''Add overlay.''' |
| 45 |
|
45 |
|
| 46 |
self.supported() |
46 |
self.supported() |
| 47 |
|
47 |
|
| 48 |
Overlay.add(self, base) |
48 |
Overlay.add(self, base) |
| 49 |
|
49 |
|
| 50 |
return self.cmd(self.binary + ' co "' + self.src + '/" "' + |
50 |
if quiet: |
|
|
51 |
quiet_option = '-q ' |
| 52 |
else: |
| 53 |
quiet_option = '' |
| 54 |
|
| 55 |
return self.cmd(self.binary + ' co ' + quiet_option + '"' + self.src + '/" "' + |
| 51 |
path([base, self.name]) + '"') |
56 |
path([base, self.name]) + '"') |
| 52 |
|
57 |
|
| 53 |
def sync(self, base): |
58 |
def sync(self, base, quiet = False): |
| 54 |
'''Sync overlay.''' |
59 |
'''Sync overlay.''' |
| 55 |
|
60 |
|
| 56 |
self.supported() |
61 |
self.supported() |
| 57 |
|
62 |
|
| 58 |
return self.cmd(self.binary + ' update "' + path([base, self.name]) + |
63 |
if quiet: |
|
|
64 |
quiet_option = '-q ' |
| 65 |
else: |
| 66 |
quiet_option = '' |
| 67 |
|
| 68 |
return self.cmd(self.binary + ' up ' + quiet_option + '"' + path([base, self.name]) + |
| 59 |
'"') |
69 |
'"') |
| 60 |
|
70 |
|
| 61 |
def supported(self): |
71 |
def supported(self): |
| 62 |
-- layman/overlays/tar.py |
72 |
++ layman/overlays/tar.py |
|
Lines 88-94
Link Here
|
| 88 |
else: |
88 |
else: |
| 89 |
self.category = '' |
89 |
self.category = '' |
| 90 |
|
90 |
|
| 91 |
def add(self, base): |
91 |
def add(self, base, quiet = False): |
| 92 |
'''Add overlay.''' |
92 |
'''Add overlay.''' |
| 93 |
|
93 |
|
| 94 |
self.supported() |
94 |
self.supported() |
|
Lines 163-169
Link Here
|
| 163 |
|
163 |
|
| 164 |
return result |
164 |
return result |
| 165 |
|
165 |
|
| 166 |
def sync(self, base): |
166 |
def sync(self, base, quiet = False): |
| 167 |
'''Sync overlay.''' |
167 |
'''Sync overlay.''' |
| 168 |
|
168 |
|
| 169 |
self.supported() |
169 |
self.supported() |
