mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-11 16:36:14 +01:00
Code

- adapt 'osc pull' to new addlist implementation

Browse Source
This commit is contained in:
Michael Schroeder 2010-10-29 17:41:39 +02:00
parent 6b618b29be
commit 1299063228
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osc/commandline.py
View File

@ -5756,6 +5756,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
print statfrmt('D', name) print statfrmt('D', name)
p.put_on_deletelist(name) p.put_on_deletelist(name)
os.unlink(name) os.unlink(name)
elif md5_old == '':
print statfrmt('A', name)
self.download(name, md5_new, dir_new, name)
p.put_on_addlist(name)
else: else:
print statfrmt('U', name) print statfrmt('U', name)
self.download(name, md5_new, dir_new, name) self.download(name, md5_new, dir_new, name)
@ -5790,6 +5794,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
print statfrmt('?', name) print statfrmt('?', name)
p.put_on_conflictlist(name) p.put_on_conflictlist(name)
p.write_deletelist() p.write_deletelist()
p.write_addlist()
p.write_conflictlist() p.write_conflictlist()
# store new linkrev # store new linkrev
store_write_string(p.absdir, '_pulled', linkinfo_new.get('srcmd5') + '\n') store_write_string(p.absdir, '_pulled', linkinfo_new.get('srcmd5') + '\n')