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

Merge pull request #233 from aplanas/master

Browse Source 
Sometimes __file__ points to the .pyc file.
This commit is contained in:
Stephan Kulow 2014-09-09 14:00:46 +02:00
commit 02ca8a754e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc-check_repo.py
View File

@ -31,7 +31,7 @@ from osc import cmdln
# Expand sys.path to search modules inside the pluging directory # Expand sys.path to search modules inside the pluging directory
PLUGINDIR = os.path.expanduser(os.path.dirname(os.path.realpath(__file__))) PLUGINDIR = os.path.dirname(os.path.realpath(__file__.replace('.pyc', '.py')))
sys.path.append(PLUGINDIR) sys.path.append(PLUGINDIR)
from osclib.checkrepo import CheckRepo from osclib.checkrepo import CheckRepo
from osclib.cycle import CycleDetector from osclib.cycle import CycleDetector

7
osc-check_source.py
View File

@ -23,8 +23,8 @@ from osc.core import makeurl
from osc import cmdln from osc import cmdln
# Expand sys.path to search modules inside the pluging directory # Expand sys.path to search modules inside the pluging directory
_plugin_dir = os.path.expanduser('~/.osc-plugins') PLUGINDIR = os.path.dirname(os.path.realpath(__file__.replace('.pyc', '.py')))
sys.path.append(_plugin_dir) sys.path.append(PLUGINDIR)
from osclib.stagingapi import StagingAPI from osclib.stagingapi import StagingAPI
@ -263,8 +263,7 @@ def _checker_one_request(self, rq, opts):
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
sourcechecker = os.path.dirname(os.path.realpath(os.path.expanduser('~/.osc-plugins/osc-check_source.py'))) sourcechecker = os.path.join(PLUGINDIR, 'source-checker.pl')
sourcechecker = os.path.join(sourcechecker, 'source-checker.pl')
civs = "" civs = ""
new_version = None new_version = None
if old_infos['version'] and old_infos['version'] != new_infos['version']: if old_infos['version'] and old_infos['version'] != new_infos['version']:

5
osclib/select_command.py
View File

@ -92,11 +92,12 @@ class SelectCommand(object):
return self.api.move_between_project(fprj, request, self.target_project) return self.api.move_between_project(fprj, request, self.target_project)
elif request in staged_requests and not move: elif request in staged_requests and not move:
# Previously selected, but not explicit move # Previously selected, but not explicit move
fprj = self.api.packages_staged[staged_requests[request]]['prj']
msg = 'Request {} is already tracked in "{}".' msg = 'Request {} is already tracked in "{}".'
msg = msg.format(request, staged_requests[request]) msg = msg.format(request, fprj)
if staged_requests[request] != self.target_project: if staged_requests[request] != self.target_project:
msg += '\nUse --move modifier to move the request from "{}" to "{}"' msg += '\nUse --move modifier to move the request from "{}" to "{}"'
msg = msg.format(staged_requests[request], self.target_project) msg = msg.format(fprj, self.target_project)
print(msg) print(msg)
return True return True
else: else: