mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 06:46:15 +01:00
Code

generated service files are always to be skipped regarding status and commit

Browse Source
This commit is contained in:
Adrian Schröter 2010-07-28 12:08:40 +02:00
parent 98aa12c9a3
commit d128ff4601
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osc/commandline.py
View File

@ -5415,7 +5415,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
p = Package('.') p = Package('.')
# check if everything is committed # check if everything is committed
for filename in p.filenamelist: for filename in p.filenamelist:
if p.status(filename) != ' ': state = p.status(filename)
if state != ' ' and state != 'S':
raise oscerr.WrongArgs('Please commit your local changes first!') raise oscerr.WrongArgs('Please commit your local changes first!')
# check if we need to update # check if we need to update
upstream_rev = p.latest_rev() upstream_rev = p.latest_rev()

4
osc/core.py
View File

@ -1239,7 +1239,7 @@ class Package:
exists_in_store = True exists_in_store = True
if n in self.skipped: if n in self.skipped or n.startswith('_service:'):
state = 'S' state = 'S'
elif exists and not exists_in_store and known_by_meta: elif exists and not exists_in_store and known_by_meta:
state = 'D' state = 'D'
@ -4838,6 +4838,8 @@ def getStatus(pacs, prj_obj=None, verbose=False, quiet=False):
lines.append(statfrmt(state, os.path.normpath(os.path.join(prj_obj.dir, p.name)))) lines.append(statfrmt(state, os.path.normpath(os.path.join(prj_obj.dir, p.name))))
for filename in p.todo: for filename in p.todo:
if filename.startswith('_service:'):
continue
if filename in p.excluded: if filename in p.excluded:
continue continue
if filename in p.skipped: if filename in p.skipped: