mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-02 17:56:15 +01:00
Code

implemented --output-dir command line option

Browse Source
This commit is contained in:
Ed Bartosh 2011-10-06 15:51:08 +03:00 committed by Adrian Schröter
parent 321cbdc9ff
commit b190f27d00
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osc/commandline.py
View File

@ -3366,6 +3366,9 @@ Please submit there instead, or use --nodevelproject to force direct submission.
@cmdln.option('-c', '--current-dir', action='store_true', @cmdln.option('-c', '--current-dir', action='store_true',
help='place PACKAGE folder in the current directory' \ help='place PACKAGE folder in the current directory' \
'instead of a PROJECT/PACKAGE directory') 'instead of a PROJECT/PACKAGE directory')
@cmdln.option('-o', '--output-dir', metavar='outdir',
help='place package in the specified directory' \
'instead of a PROJECT/PACKAGE directory')
@cmdln.option('-s', '--source-service-files', action='store_true', @cmdln.option('-s', '--source-service-files', action='store_true',
help='Run source services.' ) help='Run source services.' )
@cmdln.option('-S', '--server-side-source-service-files', action='store_true', @cmdln.option('-S', '--server-side-source-service-files', action='store_true',
@ -3454,9 +3457,13 @@ Please submit there instead, or use --nodevelproject to force direct submission.
get_source_file(apiurl, project, package, filename, revision=rev, progress_obj=self.download_progress) get_source_file(apiurl, project, package, filename, revision=rev, progress_obj=self.download_progress)
elif package: elif package:
output_dir = None
if opts.current_dir: if opts.current_dir:
project_dir = None project_dir = None
checkout_package(apiurl, project, package, rev, expand_link=expand_link, \ if opts.output_dir:
project_dir = None
output_dir = getTransActPath(os.path.realpath(opts.output_dir))
checkout_package(apiurl, project, package, rev, output_dir, expand_link=expand_link, \
prj_dir=project_dir, service_files = opts.source_service_files, server_service_files=opts.server_side_source_service_files, progress_obj=self.download_progress, size_limit=opts.limit_size, meta=opts.meta) prj_dir=project_dir, service_files = opts.source_service_files, server_service_files=opts.server_side_source_service_files, progress_obj=self.download_progress, size_limit=opts.limit_size, meta=opts.meta)
print_request_list(apiurl, project, package) print_request_list(apiurl, project, package)

24
osc/core.py
View File

@ -3972,29 +3972,30 @@ def make_dir(apiurl, project, package, pathname=None, prj_dir=None, package_trac
# and should rename this path component by appending '.proj' # and should rename this path component by appending '.proj'
# and give user a warning message, to discourage such clashes # and give user a warning message, to discourage such clashes
pathname = pathname or getTransActPath(os.path.join(prj_dir, package)) path = pathname or getTransActPath(os.path.join(prj_dir, package))
if not pathname:
if is_package_dir(prj_dir): if is_package_dir(prj_dir):
# we want this to become a project directory, # we want this to become a project directory,
# but it already is a package directory. # but it already is a package directory.
raise oscerr.OscIOError(None, 'checkout_package: package/project clash. Moving myself away not implemented') raise oscerr.OscIOError(None, 'checkout_package: package/project clash. Moving myself away not implemented')
if not is_project_dir(prj_dir): if not is_project_dir(prj_dir) and not pathname:
# this directory could exist as a parent direory for one of our earlier # this directory could exist as a parent direory for one of our earlier
# checked out sub-projects. in this case, we still need to initialize it. # checked out sub-projects. in this case, we still need to initialize it.
print statfrmt('A', prj_dir) print statfrmt('A', path)
Project.init_project(apiurl, prj_dir, project, package_tracking) Project.init_project(apiurl, prj_dir, project, package_tracking)
if is_project_dir(os.path.join(prj_dir, package)): if is_project_dir(path):
# the thing exists, but is a project directory and not a package directory # the thing exists, but is a project directory and not a package directory
# FIXME: this should be a warning message to discourage package/project clashes # FIXME: this should be a warning message to discourage package/project clashes
raise oscerr.OscIOError(None, 'checkout_package: package/project clash. Moving project away not implemented') raise oscerr.OscIOError(None, 'checkout_package: package/project clash. Moving project away not implemented')
if not os.path.exists(path):
if not os.path.exists(os.path.join(prj_dir, package)): print statfrmt('A', path)
print statfrmt('A', pathname) os.mkdir(path)
os.mkdir(os.path.join(prj_dir, package))
# os.mkdir(os.path.join(prj_dir, package, store)) # os.mkdir(os.path.join(prj_dir, package, store))
return os.path.join(prj_dir, package) return path
def checkout_package(apiurl, project, package, def checkout_package(apiurl, project, package,
@ -4051,9 +4052,6 @@ def checkout_package(apiurl, project, package,
print "found root of %s at %s" % (oldproj, root_dots) print "found root of %s at %s" % (oldproj, root_dots)
prj_dir = root_dots + prj_dir prj_dir = root_dots + prj_dir
if not pathname:
pathname = getTransActPath(os.path.join(prj_dir, package))
# before we create directories and stuff, check if the package actually # before we create directories and stuff, check if the package actually
# exists # exists
show_package_meta(apiurl, project, package, meta) show_package_meta(apiurl, project, package, meta)
@ -4075,7 +4073,7 @@ def checkout_package(apiurl, project, package,
p = Package.init_package(apiurl, project, package, directory, size_limit, meta, progress_obj) p = Package.init_package(apiurl, project, package, directory, size_limit, meta, progress_obj)
if isfrozen: if isfrozen:
p.mark_frozen() p.mark_frozen()
if conf.config['do_package_tracking']: if conf.config['do_package_tracking'] and not pathname:
# check if we can re-use an existing project object # check if we can re-use an existing project object
if prj_obj is None: if prj_obj is None:
prj_obj = Project(prj_dir) prj_obj = Project(prj_dir)