mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-14 01:26:23 +01:00
Code

- fixed 'project/package/repository/arch' support

Browse Source
This commit is contained in:
Marcus Huewe 2010-01-28 20:00:34 +01:00
parent 612ac35f28
commit 8c50908891
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc/commandline.py
View File

@ -2803,7 +2803,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
osc remotebuildlog project/package/repository/arch osc remotebuildlog project/package/repository/arch
${cmd_option_list} ${cmd_option_list}
""" """
if len(args) == 1: if len(args) == 1 and args[0].startswith('http'):
apiurl, project, package, repository, arch = parse_buildlogurl(args[0]) apiurl, project, package, repository, arch = parse_buildlogurl(args[0])
else: else:
args = slash_split(args) args = slash_split(args)

4
osc/core.py
View File

@ -33,7 +33,7 @@ except ImportError:
DISTURL_RE = re.compile(r"^(?P<bs>.*)://(?P<apiurl>.*?)/(?P<project>.*?)/(?P<repository>.*?)/(?P<revision>.*)-(?P<source>.*)$") DISTURL_RE = re.compile(r"^(?P<bs>.*)://(?P<apiurl>.*?)/(?P<project>.*?)/(?P<repository>.*?)/(?P<revision>.*)-(?P<source>.*)$")
BUILDLOGURL_RE = re.compile(r"^(?P<apiurl>https://.*?)/build/(?P<project>.*?)/(?P<repository>.*?)/(?P<arch>.*?)/(?P<package>.*?)/_log$") BUILDLOGURL_RE = re.compile(r"^(?P<apiurl>https?://.*?)/build/(?P<project>.*?)/(?P<repository>.*?)/(?P<arch>.*?)/(?P<package>.*?)/_log$")
BUFSIZE = 1024*1024 BUFSIZE = 1024*1024
store = '.osc' store = '.osc'
@ -1714,7 +1714,7 @@ def parse_buildlogurl(buildlogurl):
m = BUILDLOGURL_RE.match(buildlogurl) m = BUILDLOGURL_RE.match(buildlogurl)
if not m: if not m:
raise oscerr.WrongArgs("`%s' does not look like url with a build log" % buildlogurl) raise oscerr.WrongArgs('\'%s\' does not look like url with a build log' % buildlogurl)
return (m.group('apiurl'), m.group('project'), m.group('package'), m.group('repository'), m.group('arch')) return (m.group('apiurl'), m.group('project'), m.group('package'), m.group('repository'), m.group('arch'))