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

- follow renamed attribute to OBS:MaintenanceProject

Browse Source
This commit is contained in:
Adrian Schröter 2011-03-11 11:07:35 +01:00
parent 4c970f867b
commit adbd54045c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osc/commandline.py
View File

@ -429,20 +429,20 @@ class Osc(cmdln.Cmdln):
sys.exit('This command must be called in a checked out project.') sys.exit('This command must be called in a checked out project.')
patchinfo = None patchinfo = None
for p in meta_get_packagelist(apiurl, project): for p in meta_get_packagelist(apiurl, project):
if p.startswith("_patchinfo:"): if p.startswith("_patchinfo") or p.startswith("patchinfo"):
patchinfo = p patchinfo = p
if opts.force or not patchinfo: if opts.force or not patchinfo:
print "Creating initial patchinfo..." print "Creating initial patchinfo..."
query='cmd=createpatchinfo' query='cmd=createpatchinfo'
if opts.new: if opts.new:
query='&new_format=1' query+='&new_format=1'
if args and args[0]: if args and args[0]:
query += "&name=" + args[0] query += "&name=" + args[0]
url = makeurl(apiurl, ['source', project], query=query) url = makeurl(apiurl, ['source', project], query=query)
f = http_POST(url) f = http_POST(url)
for p in meta_get_packagelist(apiurl, project): for p in meta_get_packagelist(apiurl, project):
if p.startswith("_patchinfo:") or p.startswith("patchinfo"): if p.startswith("_patchinfo") or p.startswith("patchinfo"):
patchinfo = p patchinfo = p
# CAUTION: # CAUTION:
@ -2403,7 +2403,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
@cmdln.option('-a', '--attribute', metavar='ATTRIBUTE', @cmdln.option('-a', '--attribute', metavar='ATTRIBUTE',
help='Use this attribute to find default maintenance project (default is OBS:Maintenance)') help='Use this attribute to find default maintenance project (default is OBS:MaintenanceProject)')
@cmdln.option('-m', '--message', metavar='TEXT', @cmdln.option('-m', '--message', metavar='TEXT',
help='specify message TEXT') help='specify message TEXT')
def do_maintenancerequest(self, subcmd, opts, *args): def do_maintenancerequest(self, subcmd, opts, *args):
@ -2423,7 +2423,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
args = slash_split(args) args = slash_split(args)
apiurl = self.get_api_url() apiurl = self.get_api_url()
attribute = "OBS:Maintenance" # default attribute as defined in api code. attribute = "OBS:MaintenanceProject" # default attribute as defined in api code.
if opts.attribute: if opts.attribute:
attribute = opts.attribute attribute = opts.attribute
@ -2447,7 +2447,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
root = res['project_id'] root = res['project_id']
project = root.find('project') project = root.find('project')
if project is None: if project is None:
sys.exit('Unable to find defined OBS:Maintenance project on server.') sys.exit('Unable to find defined OBS:MaintenanceProject project on server.')
target_project = project.get('name') target_project = project.get('name')
print 'Using target project \'%s\'' % target_project print 'Using target project \'%s\'' % target_project