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

- do_status: mark a frozen package with an "F"

Browse Source
This commit is contained in:
Marcus Huewe 2014-11-21 16:12:26 +01:00
parent fddf2e3e6c
commit 42d3e815c1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osc/commandline.py
View File

@ -4131,6 +4131,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
'M' Modified 'M' Modified
'?' item is not under version control '?' item is not under version control
'!' item is missing (removed by non-osc command) or incomplete '!' item is missing (removed by non-osc command) or incomplete
'F' Frozen (use "osc pull" to merge conflicts) (package-only state)
examples: examples:
osc st osc st
@ -4164,7 +4165,9 @@ Please submit there instead, or use --nodevelproject to force direct submission.
# state is != ' ' # state is != ' '
lines.append(statfrmt(st, os.path.normpath(os.path.join(prj.dir, pac)))) lines.append(statfrmt(st, os.path.normpath(os.path.join(prj.dir, pac))))
continue continue
if st == ' ' and opts.verbose or st != ' ': if p.isfrozen():
lines.append(statfrmt('F', os.path.normpath(os.path.join(prj.dir, pac))))
elif st == ' ' and opts.verbose or st != ' ':
lines.append(statfrmt(st, os.path.normpath(os.path.join(prj.dir, pac)))) lines.append(statfrmt(st, os.path.normpath(os.path.join(prj.dir, pac))))
states = p.get_status(opts.show_excluded, *excl_states) states = p.get_status(opts.show_excluded, *excl_states)
for st, filename in sorted(states, lambda x, y: cmp(x[1], y[1])): for st, filename in sorted(states, lambda x, y: cmp(x[1], y[1])):