mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-24 00:56:15 +01:00
Code

- revert 3834263171

Browse Source 
- fixed "parse_repoarchdescr": don't ignore repo if the repo name is a
  supported arch name
This commit is contained in:
Marcus Huewe 2011-09-30 14:53:14 +02:00
parent 3834263171
commit 7995613991
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osc/commandline.py
View File

@ -4701,7 +4701,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
print row
def parse_repoarchdescr(self, args, noinit = False, alternative_project = None, ignore_descr = False, repository = None, architecture = None):
def parse_repoarchdescr(self, args, noinit = False, alternative_project = None, ignore_descr = False):
"""helper to parse the repo, arch and build description from args"""
import osc.build
import glob
@ -4711,8 +4711,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if arg.endswith('.spec') or arg.endswith('.dsc') or arg.endswith('.kiwi'):
arg_descr = arg
else:
if arg in osc.build.can_also_build.get(osc.build.hostarch, []) or \
arg in osc.build.hostarch:
if (arg in osc.build.can_also_build.get(osc.build.hostarch, [])
or arg in osc.build.hostarch) and arg_arch is None:
arg_arch = arg
elif not arg_repository:
arg_repository = arg
@ -4723,12 +4723,6 @@ Please submit there instead, or use --nodevelproject to force direct submission.
arg_arch = arg_arch or osc.build.hostarch
# take manual specified repository
if repository:
arg_repository = repository
if architecture:
arg_arch = architecture
repositories = []
# store list of repos for potential offline use
repolistfile = os.path.join(os.getcwd(), osc.core.store, "_build_repositories")
@ -4936,7 +4930,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if len(args) > 3:
raise oscerr.WrongArgs('Too many arguments')
args = self.parse_repoarchdescr(args, opts.noinit or opts.offline, opts.alternative_project, args[0], args[1])
args = self.parse_repoarchdescr(args, opts.noinit or opts.offline, opts.alternative_project)
# check for source services
r = None