mirror of
https://github.com/openSUSE/osc.git
synced 2024-09-20 09:16:16 +02:00
- removed hack for #399247 - there's nothing special when expanding/unexpanding links
This commit is contained in:
parent
e21e61f20e
commit
80bf280d8b
@ -3143,13 +3143,15 @@ Please submit there instead, or use --nodevelproject to force direct submission.
|
||||
if len(pacs) > 1:
|
||||
print 'Updating %s' % p.name
|
||||
|
||||
# this shouldn't be needed anymore with the new update mechanism
|
||||
# an expand/unexpand update is treated like a normal update (there's nothing special)
|
||||
# FIXME: ugly workaround for #399247
|
||||
if opts.expand_link or opts.unexpand_link:
|
||||
if [ i for i in p.filenamelist+p.filenamelist_unvers if p.status(i) != ' ' and p.status(i) != '?']:
|
||||
print >>sys.stderr, 'osc: cannot expand/unexpand because your working ' \
|
||||
'copy has local modifications.\nPlease revert/commit them ' \
|
||||
'and try again.'
|
||||
sys.exit(1)
|
||||
# if opts.expand_link or opts.unexpand_link:
|
||||
# if [ i for i in p.filenamelist+p.filenamelist_unvers if p.status(i) != ' ' and p.status(i) != '?']:
|
||||
# print >>sys.stderr, 'osc: cannot expand/unexpand because your working ' \
|
||||
# 'copy has local modifications.\nPlease revert/commit them ' \
|
||||
# 'and try again.'
|
||||
# sys.exit(1)
|
||||
|
||||
if not rev:
|
||||
if opts.expand_link and p.islink() and not p.isexpanded():
|
||||
|
Loading…
Reference in New Issue
Block a user