1
0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-23 05:26:16 +01:00

- fixed indention+small cleanup

- added "XXX" comment due the openSUSE specific "osc co obs://" implementation
This commit is contained in:
Marcus Huewe 2011-02-01 18:37:17 +01:00
parent bb02a34622
commit 1a89821f36

View File

@ -2868,6 +2868,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
else: else:
expand_link = True expand_link = True
# XXX: this too openSUSE-setup specific...
# FIXME: this should go into ~jw/patches/osc/osc.proj_pack_20101201.diff # FIXME: this should go into ~jw/patches/osc/osc.proj_pack_20101201.diff
# to be available to all subcommands via @cmdline.prep(proj_pack) # 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
@ -2878,15 +2879,12 @@ Please submit there instead, or use --nodevelproject to force direct submission.
# platform = m.group(3) # platform = m.group(3)
opts.revision = m.group(4) opts.revision = m.group(4)
package = m.group(5) package = m.group(5)
apiurl = re.sub('/build\.', '/api.', apiurl) apiurl = apiurl.replace('/build.', '/api.')
filename = None filename = None
else: else:
args = slash_split(args) args = slash_split(args)
project = package = filename = None project = package = filename = None
apiurl = self.get_api_url() apiurl = self.get_api_url()
try: try:
project = project_dir = args[0] project = project_dir = args[0]
package = args[1] package = args[1]
@ -2894,11 +2892,9 @@ Please submit there instead, or use --nodevelproject to force direct submission.
except: except:
pass pass
if args and len(args) == 1: if len(args) == 1 and is_project_dir(os.curdir):
localdir = os.getcwd() project = store_read_project(os.curdir)
if is_project_dir(localdir): project_dir = os.curdir
project = store_read_project(localdir)
project_dir = localdir
package = args[0] package = args[0]
rev, dummy = parseRevisionOption(opts.revision) rev, dummy = parseRevisionOption(opts.revision)