mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-08-06 15:43:39 +02:00
Code Activity

- do_branch: interpolate 'getpac_default_project' config value in the help text

Browse Source
This commit is contained in:
Marcus Hüwe
2009-09-03 21:32:36 +00:00
parent bcb16c3320
commit 08cfb45142
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osc/commandline.py
View File

@@ -1229,7 +1229,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if nothing else specified.
With getpac or bco, the branched package will come from
openSUSE:Factory
%(getpac_default_project)s
if nothing else specified.
usage:
@@ -1241,14 +1241,12 @@ Please submit there instead, or use --nodevelproject to force direct submission.
${cmd_option_list}
"""
# FIXME: how can we interpolate conf.config['getpac_default_project'] in the above message?
if subcmd == 'getpac' or subcmd == 'branchco' or subcmd == 'bco': opts.checkout = True
args = slash_split(args)
tproject = tpackage = None
if ((subcmd == 'getpac' or subcmd == 'bco') and len(args) == 1):
print >>sys.stderr, "defaulting to %s/%s" % (conf.config['getpac_default_project'],args[0])
if (subcmd == 'getpac' or subcmd == 'bco') and len(args) == 1:
print >>sys.stderr, 'defaulting to %s/%s' % (conf.config['getpac_default_project'], args[0])
# python has no args.unshift ???
args = [ conf.config['getpac_default_project'] , args[0] ]

3
osc/core.py
View File

@@ -1730,8 +1730,7 @@ def makeurl(baseurl, l, query=[]):
query = urlencode(query)
scheme, netloc = urlsplit(baseurl)[0:2]
u = urlunsplit((scheme, netloc, '/'.join(l), query, ''))
return u
return urlunsplit((scheme, netloc, '/'.join(l), query, ''))
def http_request(method, url, headers={}, data=None, file=None, timeout=100):