mirror of
https://github.com/openSUSE/osc.git
synced 2024-09-20 09:16:16 +02:00
- do_repairwc: print more details how to fix a broken wc
This commit is contained in:
parent
56d3b9b479
commit
69c3161e93
@ -6024,9 +6024,9 @@ Please submit there instead, or use --nodevelproject to force direct submission.
|
|||||||
except oscerr.WorkingCopyInconsistent:
|
except oscerr.WorkingCopyInconsistent:
|
||||||
p = Package(i, wc_check=False)
|
p = Package(i, wc_check=False)
|
||||||
p.wc_repair()
|
p.wc_repair()
|
||||||
print 'done. Please check the state of the wc (via \'osc status\').'
|
print 'done. Please check the state of the wc (via \'osc status %s\').' % i
|
||||||
else:
|
else:
|
||||||
print >>sys.stderr, 'osc: working copy is not inconsistent'
|
print >>sys.stderr, 'osc: working copy \'%s\' is not inconsistent' % i
|
||||||
# fini!
|
# fini!
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
|
@ -809,9 +809,9 @@ class Package:
|
|||||||
self.update_datastructs()
|
self.update_datastructs()
|
||||||
if wc_check and self.wc_check():
|
if wc_check and self.wc_check():
|
||||||
msg = 'Your working copy \'%s\' is in an inconsistent state.\n' \
|
msg = 'Your working copy \'%s\' is in an inconsistent state.\n' \
|
||||||
'Please run \'osc repairwc\' (Note this might _remove_\n' \
|
'Please run \'osc repairwc %s\' (Note this might _remove_\n' \
|
||||||
'files from the .osc/ dir). Please check the state\n' \
|
'files from the .osc/ dir). Please check the state\n' \
|
||||||
'of the working copy afterwards (via \'osc status\')' % self.dir
|
'of the working copy afterwards (via \'osc status %s\')' % (self.dir, self.dir, self.dir)
|
||||||
raise oscerr.WorkingCopyInconsistent(self.prjname, self.name, msg)
|
raise oscerr.WorkingCopyInconsistent(self.prjname, self.name, msg)
|
||||||
|
|
||||||
self.todo = []
|
self.todo = []
|
||||||
|
Loading…
Reference in New Issue
Block a user