From 4cc87b2c572db7dbb479be369d6340bb2f8acc98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 27 Jun 2018 10:25:45 +0200 Subject: [PATCH] fix DISTURL checkout for package containers using a multibuild flavor --- osc/commandline.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/osc/commandline.py b/osc/commandline.py index 87f8a4fd..77b1ef5e 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -4335,11 +4335,10 @@ Please submit there instead, or use --nodevelproject to force direct submission. raise oscerr.WrongArgs('Incorrect number of arguments.\n\n' \ + self.get_cmd_help('checkout')) - # XXX: this too openSUSE-setup specific... - # FIXME: this should go into ~jw/patches/osc/osc.proj_pack_20101201.diff - # to be available to all subcommands via @cmdline.prep(proj_pack) + # A DISTURL can be found in build results to be able to relocate the source used to build + # obs://$OBS_INSTANCE/$PROJECT/$REPOSITORY/$XSRCMD5-$PACKAGE(:$FLAVOR) # 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: apiurl = "https://" + m.group(1) project = project_dir = m.group(2)