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

Merge pull request #32 from aplanas/master

Browse Source 
Detect real path to find the Perl script
This commit is contained in:
Stephan Kulow 2013-09-26 02:25:43 -07:00
commit 6e6b352f64
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osc-check_repo.py
View File

@ -945,7 +945,9 @@ def _check_repo_group(self, id_, reqs, opts):
params_file = tempfile.NamedTemporaryFile(delete=False)
params_file.write('\n'.join(f for f in toignore if f.strip()))
params_file.close()
civs = "LC_ALL=C perl /suse/coolo/checker/repo-checker.pl '%s' -f %s 2>&1" % (destdir, params_file.name)
repochecker = os.path.dirname(os.path.realpath(os.path.expanduser('~/.osc-plugins/osc-check_repo.py')))
repochecker = os.path.join(repochecker, 'repo-checker.pl')
civs = "LC_ALL=C perl %s '%s' -f %s 2>&1" % (repochecker, destdir, params_file.name)
#exit(1)
p = subprocess.Popen(civs, shell=True, stdout=subprocess.PIPE, close_fds=True)
#ret = os.waitpid(p.pid, 0)[1]

4
osc-check_source.py
View File

@ -164,7 +164,9 @@ def _checker_one_request(self, rq, cmd, opts):
self._checker_change_review_state(opts, id, 'declined', by_group='factory-auto', message=msg)
continue
civs = "LC_ALL=C perl /suse/coolo/checker/source-checker.pl _old %s 2>&1" % tpkg
sourcechecker = os.path.dirname(os.path.realpath(os.path.expanduser('~/.osc-plugins/osc-check_source.py')))
sourcechecker = os.path.join(sourcechecker, 'source-checker.pl')
civs = "LC_ALL=C perl %s _old %s 2>&1" % (sourcechecker, tpkg)
p = subprocess.Popen(civs, shell=True, stdout=subprocess.PIPE, close_fds=True)
ret = os.waitpid(p.pid, 0)[1]
checked = p.stdout.readlines()