From 129906322817ca7c3e520dec6111f70c6bf70a81 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Fri, 29 Oct 2010 17:41:39 +0200 Subject: [PATCH] - adapt 'osc pull' to new addlist implementation --- osc/commandline.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/osc/commandline.py b/osc/commandline.py index d622da58..6f6a6d84 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -5756,6 +5756,10 @@ Please submit there instead, or use --nodevelproject to force direct submission. print statfrmt('D', name) p.put_on_deletelist(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: print statfrmt('U', 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) p.put_on_conflictlist(name) p.write_deletelist() + p.write_addlist() p.write_conflictlist() # store new linkrev store_write_string(p.absdir, '_pulled', linkinfo_new.get('srcmd5') + '\n')