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

give the perl script a NEW_VERSION env variable if it's an update

Browse Source
This commit is contained in:
Stephan Kulow 2014-06-26 11:45:30 +02:00
parent 59b7f061cb
commit ee8d338530
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
osc-check_source.py
View File

@ -36,25 +36,29 @@ def _silent_running(fn):
checkout_pkg = _silent_running(checkout_package) checkout_pkg = _silent_running(checkout_package)
def _checker_parse_name(self, apiurl, project, package, def _checker_parse(self, apiurl, project, package,
revision=None, brief=False, verbose=False): revision=None, brief=False, verbose=False):
query = {'view': 'info', 'parse': 1} query = {'view': 'info', 'parse': 1}
if revision: if revision:
query['rev'] = revision query['rev'] = revision
url = makeurl(apiurl, ['source', project, package], query) url = makeurl(apiurl, ['source', project, package], query)
ret = {'name': None, 'version': None }
try: try:
xml = ET.parse(http_GET(url)) xml = ET.parse(http_GET(url)).getroot()
name = xml.find('name')
except urllib2.HTTPError, e: except urllib2.HTTPError, e:
print('ERROR in URL %s [%s]' % (url, e)) print('ERROR in URL %s [%s]' % (url, e))
return None return ret
if name is None or not name.text: # ET's boolean check is screwed
return None if xml.find('name') != None:
ret['name'] = xml.find('name').text
return name.text if xml.find('version') != None:
ret['version'] = xml.find('version').text
return ret
def _checker_change_review_state(self, opts, id, newstate, by_group='', by_user='', message='', supersed=None): def _checker_change_review_state(self, opts, id, newstate, by_group='', by_user='', message='', supersed=None):
""" taken from osc/osc/core.py, improved: """ taken from osc/osc/core.py, improved:
@ -204,15 +208,20 @@ def _checker_one_request(self, rq, opts):
os.rename(pkg, tpkg) os.rename(pkg, tpkg)
self._checker_prepare_dir(tpkg) self._checker_prepare_dir(tpkg)
r = self._checker_parse_name(opts.apiurl, prj, pkg, revision=rev) new_infos = self._checker_parse(opts.apiurl, prj, pkg, revision=rev)
if r != tpkg: if new_infos['name'] != tpkg:
msg = "A pkg submitted as %s has to build as 'Name: %s' - found Name '%s'" % (tpkg, tpkg, r) msg = "A pkg submitted as %s has to build as 'Name: %s' - found Name '%s'" % (tpkg, tpkg, new_infos['name'])
self._checker_change_review_state(opts, id, 'declined', by_group='factory-auto', message=msg) self._checker_change_review_state(opts, id, 'declined', by_group='factory-auto', message=msg)
continue continue
old_infos = self._checker_parse(opts.apiurl, tprj, tpkg)
sourcechecker = os.path.dirname(os.path.realpath(os.path.expanduser('~/.osc-plugins/osc-check_source.py'))) sourcechecker = os.path.dirname(os.path.realpath(os.path.expanduser('~/.osc-plugins/osc-check_source.py')))
sourcechecker = os.path.join(sourcechecker, 'source-checker.pl') sourcechecker = os.path.join(sourcechecker, 'source-checker.pl')
civs = "LC_ALL=C perl %s _old %s 2>&1" % (sourcechecker, tpkg) civs = ""
if old_infos['version'] and old_infos['version'] != new_infos['version']:
civs += "NEW_VERSION='{}' ".format(new_infos['version'])
civs += "LC_ALL=C perl %s _old %s 2>&1" % (sourcechecker, tpkg)
p = subprocess.Popen(civs, shell=True, stdout=subprocess.PIPE, close_fds=True) p = subprocess.Popen(civs, shell=True, stdout=subprocess.PIPE, close_fds=True)
ret = os.waitpid(p.pid, 0)[1] ret = os.waitpid(p.pid, 0)[1]
checked = p.stdout.readlines() checked = p.stdout.readlines()