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

pkglistgen: Fix exit values - True is actually bad

Browse Source
This commit is contained in:
Stephan Kulow 2022-03-05 15:58:20 +01:00
parent 040e91a193
commit b93adbd9c1
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkglistgen/cli.py
View File

@ -56,7 +56,6 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
${cmd_option_list} ${cmd_option_list}
""" """
print(opts.scope)
if opts.staging: if opts.staging:
match = re.match('(.*):Staging:(.*)', opts.staging) match = re.match('(.*):Staging:(.*)', opts.staging)
opts.scope = 'staging:' + match.group(2) opts.scope = 'staging:' + match.group(2)
@ -87,8 +86,6 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
if apiurl.find('opensuse.org') > 0: if apiurl.find('opensuse.org') > 0:
os.environ['OBS_NAME'] = 'build.opensuse.org' os.environ['OBS_NAME'] = 'build.opensuse.org'
self.error_occured = False
def solve_project(project, scope): def solve_project(project, scope):
try: try:
self.tool.reset() self.tool.reset()
@ -100,7 +97,7 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
stop_after_solve=opts.stop_after_solve) stop_after_solve=opts.stop_after_solve)
except MismatchedRepoException: except MismatchedRepoException:
logging.error("Failed to create weakremovers.inc due to mismatch in repos - project most likey started building again.") logging.error("Failed to create weakremovers.inc due to mismatch in repos - project most likey started building again.")
return True return 0
scope = opts.scope scope = opts.scope
if scope.startswith('staging:'): if scope.startswith('staging:'):

2
pkglistgen/tool.py
View File

@ -770,4 +770,4 @@ class PkgListGen(ToolBase.ToolBase):
if len(error_output) > 0: if len(error_output) > 0:
self.logger.error('Difference in yml:\n' + error_output.decode('utf-8')) self.logger.error('Difference in yml:\n' + error_output.decode('utf-8'))
return True return 1