yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10 from aplanas/master

Browse Source 
Looks ok
This commit is contained in:
Michal Hrušecký 2014-02-11 12:47:23 +01:00
commit c9de68c918
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc-group.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: UTF-8 -*- # -*- coding: utf-8 -*-
# #
# (C) 2013 coolo@suse.de, openSUSE.org # (C) 2013 coolo@suse.de, openSUSE.org
# (C) 2013 tchvatal@suse.cz, openSUSE.org # (C) 2013 tchvatal@suse.cz, openSUSE.org

10
osc-staging.py
View File

@ -318,7 +318,7 @@ def _staging_check(self, project, check_everything, opts):
""" """
ret = 0 ret = 0
chng = _get_changed(opts.apiurl, project, check_everything) chng = _get_changed(opts, project, check_everything)
if len(chng) > 0: if len(chng) > 0:
for pair in chng: for pair in chng:
print >>sys.stderr, 'Error: Package "%s": %s'%(pair['pkg'],pair['msg']) print >>sys.stderr, 'Error: Package "%s": %s'%(pair['pkg'],pair['msg'])
@ -332,7 +332,7 @@ def _staging_check(self, project, check_everything, opts):
if ret == 0 or check_everything: if ret == 0 or check_everything:
print "Getting build status, this may take a while" print "Getting build status, this may take a while"
# Get staging project results # Get staging project results
f = _get_build_res(opts.apiurl, project) f = _get_build_res(opts, project)
root = ET.fromstring(''.join(f)) root = ET.fromstring(''.join(f))
# Get parent project # Get parent project
@ -357,7 +357,7 @@ def _staging_check(self, project, check_everything, opts):
print >>sys.stderr, "Error: Can't get path for '%s'!"%results.get("repository") print >>sys.stderr, "Error: Can't get path for '%s'!"%results.get("repository")
ret |= 4 ret |= 4
continue continue
f = _get_build_res(opts.apiurl, p_project.get("project"), repo=results.get("repository"), arch=results.get("arch")) f = _get_build_res(opts, p_project.get("project"), repo=results.get("repository"), arch=results.get("arch"))
p_root = ET.fromstring(''.join(f)) p_root = ET.fromstring(''.join(f))
# Find corresponding set of results in parent project # Find corresponding set of results in parent project
@ -789,14 +789,14 @@ def _staging_check_depinfo_ring(self, prj, nextprj, opts):
if nextprj: if nextprj:
print "osc linkpac -c openSUSE:Factory", source, nextprj print "osc linkpac -c openSUSE:Factory", source, nextprj
@cmdln.option('-e', '--everything', action='store_true', dest='everything',
@cmdln.option('-e', '--everything', action='store_true',
help='during check do not stop on first first issue and show them all') help='during check do not stop on first first issue and show them all')
@cmdln.option('-p', '--parent', metavar='TARGETPROJECT', @cmdln.option('-p', '--parent', metavar='TARGETPROJECT',
help='manually specify different parent project during creation of staging') help='manually specify different parent project during creation of staging')
@cmdln.option('-m', '--message', metavar='TEXT', @cmdln.option('-m', '--message', metavar='TEXT',
help='manually specify different parent project during creation of staging') help='manually specify different parent project during creation of staging')
@cmdln.option('-v', '--version', action='store_true', @cmdln.option('-v', '--version', action='store_true',
dest='version',
help='show version of the plugin') help='show version of the plugin')
def do_staging(self, subcmd, opts, *args): def do_staging(self, subcmd, opts, *args):
"""${cmd_name}: Commands to work with staging projects """${cmd_name}: Commands to work with staging projects

2
oscs/__init__.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: UTF-8 -*- # -*- coding: utf-8 -*-
# #
# (C) 2014 tchvatal@suse.cz, openSUSE.org # (C) 2014 tchvatal@suse.cz, openSUSE.org
# Distribute under GPLv2 or later # Distribute under GPLv2 or later

2
tests/__init__.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: UTF-8 -*- # -*- coding: utf-8 -*-
# #
# (C) 2014 tchvatal@suse.cz, openSUSE.org # (C) 2014 tchvatal@suse.cz, openSUSE.org
# Distribute under GPLv2 or later # Distribute under GPLv2 or later

2
tests/api_tests.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: UTF-8 -*- # -*- coding: utf-8 -*-
# #
# (C) 2014 tchvatal@suse.cz, openSUSE.org # (C) 2014 tchvatal@suse.cz, openSUSE.org
# Distribute under GPLv2 or later # Distribute under GPLv2 or later