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

Remove all references to id, use id_

Browse Source
This commit is contained in:
Alberto Planas 2013-07-22 14:29:40 +02:00
parent 4573afb109
commit 1622878e47
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
osc-check_repo.py
View File

@ -73,9 +73,9 @@ def _check_repo_fetch_group(self, opts, group):
root = ET.parse(f).getroot() root = ET.parse(f).getroot()
a = [] a = []
for req in root.find('action').findall('grouped'): for req in root.find('action').findall('grouped'):
id = int(req.attrib['id']) id_ = int(req.attrib['id'])
a.append(id) a.append(id)
opts.grouped[id] = group opts.grouped[id_] = group
opts.groups[group] = a opts.groups[group] = a
@ -104,19 +104,20 @@ def _check_repo_one_request(self, rq, opts):
self.build_excluded = False self.build_excluded = False
id = int(rq.get('id')) id_ = int(rq.get('id'))
actions = rq.findall('action') actions = rq.findall('action')
if len(actions) != 1: if len(actions) > 1:
msg = "only one action per request is supported - create a group instead: https://github.com/SUSE/hackweek/wiki/Improved-Factory-devel-project-submission-workflow" msg = 'only one action per request is supported - create a group instead: '\
print "declined " + msg 'https://github.com/SUSE/hackweek/wiki/Improved-Factory-devel-project-submission-workflow'
self._check_repo_change_review_state(opts, id, 'declined', message=msg) print 'declined ' + msg
self._check_repo_change_review_state(opts, id_, 'declined', message=msg)
return [] return []
act = actions[0] act = actions[0]
_type = act.get('type') type_ = act.get('type')
if _type != "submit": if type_ != 'submit':
self._check_repo_change_review_state(opts, id, 'accepted', self._check_repo_change_review_state(opts, id_, 'accepted',
message="Unchecked request type %s" % _type) message='Unchecked request type %s'%type_)
return [] return []
pkg = act.find('source').get('package') pkg = act.find('source').get('package')
@ -125,17 +126,17 @@ def _check_repo_one_request(self, rq, opts):
tprj = act.find('target').get('project') tprj = act.find('target').get('project')
tpkg = act.find('target').get('package') tpkg = act.find('target').get('package')
subm_id = "SUBMIT(%d):" % id subm_id = 'SUBMIT(%d):' % id_
print "%s %s/%s -> %s/%s" % (subm_id, print '%s %s/%s -> %s/%s' % (subm_id,
prj, pkg, prj, pkg,
tprj, tpkg) tprj, tpkg)
group = id group = id_
try: try:
if opts.grouped.has_key(id): if opts.grouped.has_key(id_):
group = opts.grouped[id] group = opts.grouped[id_]
else: else:
url = makeurl(opts.apiurl, ["search", "request", "id?match=action/grouped/@id=%s" % id]) url = makeurl(opts.apiurl, ["search", "request", "id?match=action/grouped/@id=%s" % id_])
root = ET.parse(http_GET(url)).getroot() root = ET.parse(http_GET(url)).getroot()
for req in root.findall('request'): for req in root.findall('request'):
group = int(req.attrib['id']) group = int(req.attrib['id'])
@ -151,7 +152,7 @@ def _check_repo_one_request(self, rq, opts):
p.tpackage = tpkg p.tpackage = tpkg
p.tproject = tprj p.tproject = tprj
p.group = group p.group = group
p.request = id p.request = id_
try: try:
url = makeurl(opts.apiurl, ["source", prj, pkg, "?expand=1&rev=%s" % rev]) url = makeurl(opts.apiurl, ["source", prj, pkg, "?expand=1&rev=%s" % rev])
root = ET.parse(http_GET(url)).getroot() root = ET.parse(http_GET(url)).getroot()
@ -184,12 +185,12 @@ def _check_repo_one_request(self, rq, opts):
pass # leave lprj pass # leave lprj
if lprj != prj or lpkg != pkg and not p.updated: if lprj != prj or lpkg != pkg and not p.updated:
msg = "%s/%s should _link to %s/%s" % (prj,spec,prj,pkg) msg = "%s/%s should _link to %s/%s" % (prj,spec,prj,pkg)
self._check_repo_change_review_state(opts, id, 'declined', message=msg) self._check_repo_change_review_state(opts, id_, 'declined', message=msg)
print msg print msg
p.updated = True p.updated = True
if lmd5 != p.rev and not p.updated: if lmd5 != p.rev and not p.updated:
msg = "%s/%s is a link but has a different md5sum than %s?" % (prj,spec,pkg) msg = "%s/%s is a link but has a different md5sum than %s?" % (prj,spec,pkg)
self._check_repo_change_review_state(opts, id, 'new', message=msg) self._check_repo_change_review_state(opts, id_, 'new', message=msg)
print msg print msg
p.updated = True p.updated = True
@ -199,7 +200,7 @@ def _check_repo_one_request(self, rq, opts):
sp.tpackage = spec sp.tpackage = spec
sp.tproject = tprj sp.tproject = tprj
sp.group = p.group sp.group = p.group
sp.request = id sp.request = id_
packs.append(sp) packs.append(sp)
sp.rev = root.attrib['srcmd5'] sp.rev = root.attrib['srcmd5']
return packs return packs
@ -408,7 +409,7 @@ def _get_base_build_src(self, opts):
return set([e.attrib['name'] for e in root.findall('entry')]) return set([e.attrib['name'] for e in root.findall('entry')])
def _check_repo_group(self, id, reqs, opts): def _check_repo_group(self, id_, reqs, opts):
print "\ncheck group", reqs print "\ncheck group", reqs
for p in reqs: for p in reqs:
if not self._check_repo_buildsuccess(p, opts): if not self._check_repo_buildsuccess(p, opts):
@ -418,7 +419,7 @@ def _check_repo_group(self, id, reqs, opts):
downloads = [] downloads = []
destdir = os.path.expanduser("~/co/%s" % str(p.group)) destdir = os.path.expanduser("~/co/%s" % str(p.group))
fetched = dict() fetched = dict()
for r in opts.groups.get(id, []): for r in opts.groups.get(id_, []):
fetched[r] = False fetched[r] = False
goodrepo = '' goodrepo = ''
packs = [] packs = []
@ -460,6 +461,7 @@ def _check_repo_group(self, id, reqs, opts):
outliers = build_deps - base_build_bin[arch] outliers = build_deps - base_build_bin[arch]
if outliers: if outliers:
print 'Outliers (%s)'%arch, outliers print 'Outliers (%s)'%arch, outliers
for p in reqs: for p in reqs:
smissing = [] smissing = []
@ -536,7 +538,7 @@ def do_check_repo(self, subcmd, opts, *args):
${cmd_option_list} ${cmd_option_list}
""" """
if len(args) == 0: if not len(args):
raise oscerr.WrongArgs("Please give a subcommand to 'osc check_repo' or try 'osc help check_repo'") raise oscerr.WrongArgs("Please give a subcommand to 'osc check_repo' or try 'osc help check_repo'")
opts.mode = '' opts.mode = ''
@ -574,5 +576,5 @@ def do_check_repo(self, subcmd, opts, *args):
a.append(p) a.append(p)
groups[p.group] = a groups[p.group] = a
for id_, reqs in groups.items(): # for id_, reqs in groups.items():
self._check_repo_group(id_, reqs, opts) # self._check_repo_group(id_, reqs, opts)