mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-08-23 22:58:53 +02:00
Code Activity

Fix calling findpacs() with os.curdir

Browse Source 
A list of strings is expected, but a string was passed.
It was working only by coincidence, because iterating
through ["."] and "." gives the same result.
This commit is contained in:
Daniel Mach
2022-09-13 16:15:59 +02:00
parent 8dbf859ce2
commit 175a44bc97
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osc/build.py
View File

@@ -1130,7 +1130,7 @@ def main(apiurl, opts, argv):
if not old_pkg_dir.startswith('/') and not opts.offline: if not old_pkg_dir.startswith('/') and not opts.offline:
data = [prj, pacname, repo, arch] data = [prj, pacname, repo, arch]
if old_pkg_dir == '_link': if old_pkg_dir == '_link':
p = core.findpacs(os.curdir)[0] p = core.findpacs([os.curdir])[0]
if not p.islink(): if not p.islink():
raise oscerr.WrongOptions('package is not a link') raise oscerr.WrongOptions('package is not a link')
data[0] = p.linkinfo.project data[0] = p.linkinfo.project

6
osc/commandline.py
View File

@@ -1395,7 +1395,7 @@ class Osc(cmdln.Cmdln):
elif len(args) <= 2: elif len(args) <= 2:
# try using the working copy at hand # try using the working copy at hand
p = findpacs(os.curdir)[0] p = findpacs([os.curdir])[0]
src_project = p.prjname src_project = p.prjname
src_package = p.name src_package = p.name
if self.options.apiurl and self.options.apiurl != p.apiurl: if self.options.apiurl and self.options.apiurl != p.apiurl:
@@ -1627,7 +1627,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
elif len(args) <= 2: elif len(args) <= 2:
# try using the working copy at hand # try using the working copy at hand
p = findpacs(os.curdir)[0] p = findpacs([os.curdir])[0]
src_project = p.prjname src_project = p.prjname
src_package = p.name src_package = p.name
if len(args) == 0 and p.islink(): if len(args) == 0 and p.islink():
@@ -2742,7 +2742,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
rev = None rev = None
if len(args) == 0: if len(args) == 0:
p = findpacs(os.curdir)[0] p = findpacs([os.curdir])[0]
project = p.prjname project = p.prjname
package = p.name package = p.name
apiurl = p.apiurl apiurl = p.apiurl