mirror of
https://github.com/openSUSE/osc.git
synced 2025-10-04 16:49:20 +02:00
fix DISTURL checkout for package containers using a multibuild flavor
This commit is contained in:
@@ -4341,11 +4341,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
|
|||||||
raise oscerr.WrongArgs('Incorrect number of arguments.\n\n' \
|
raise oscerr.WrongArgs('Incorrect number of arguments.\n\n' \
|
||||||
+ self.get_cmd_help('checkout'))
|
+ self.get_cmd_help('checkout'))
|
||||||
|
|
||||||
# XXX: this too openSUSE-setup specific...
|
# A DISTURL can be found in build results to be able to relocate the source used to build
|
||||||
# FIXME: this should go into ~jw/patches/osc/osc.proj_pack_20101201.diff
|
# obs://$OBS_INSTANCE/$PROJECT/$REPOSITORY/$XSRCMD5-$PACKAGE(:$FLAVOR)
|
||||||
# to be available to all subcommands via @cmdline.prep(proj_pack)
|
|
||||||
# obs://build.opensuse.org/openSUSE:11.3/standard/fc6c25e795a89503e99d59da5dc94a79-screen
|
# obs://build.opensuse.org/openSUSE:11.3/standard/fc6c25e795a89503e99d59da5dc94a79-screen
|
||||||
m = re.match(r"obs://([^/]+)/(\S+)/([^/]+)/([A-Fa-f\d]+)\-(\S+)", args[0])
|
m = re.match(r"obs://([^/]+)/(\S+)/([^/]+)/([A-Fa-f\d]+)\-([^:]*)(:\S+)?", args[0])
|
||||||
if m and len(args) == 1:
|
if m and len(args) == 1:
|
||||||
apiurl = "https://" + m.group(1)
|
apiurl = "https://" + m.group(1)
|
||||||
project = project_dir = m.group(2)
|
project = project_dir = m.group(2)
|
||||||
|
Reference in New Issue
Block a user