mirror of
https://github.com/openSUSE/osc.git
synced 2024-12-24 17:16:12 +01:00
Merge branch 'local-package-chroot' of https://github.com/Ericsson/osc
This commit is contained in:
commit
17e059b604
2
NEWS
2
NEWS
@ -1,5 +1,7 @@
|
||||
0.156
|
||||
- highlight scheduled jobs with dispatch problems (due to constraints)
|
||||
- allow to specify a log message in lock command
|
||||
- Add '--wipe' option to osc chroot for deleting buildroots
|
||||
|
||||
0.155
|
||||
- osc service runall: runs all service local, independend of the mode
|
||||
|
@ -606,7 +606,7 @@ def main(apiurl, opts, argv):
|
||||
except oscerr.NoWorkingCopy:
|
||||
opts.local_package = True
|
||||
if opts.local_package:
|
||||
pacname = os.path.splitext(build_descr)[0]
|
||||
pacname = os.path.splitext(os.path.basename(build_descr))[0]
|
||||
apihost = urlsplit(apiurl)[1]
|
||||
if not build_root:
|
||||
build_root = config['build-root']
|
||||
|
@ -3518,6 +3518,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
|
||||
delete_project(apiurl, prj, opts.force, msg)
|
||||
|
||||
|
||||
@cmdln.option('-m', '--message', metavar='TEXT',
|
||||
help='specify log message TEXT')
|
||||
def do_lock(self, subcmd, opts, project, package=None):
|
||||
"""${cmd_name}: Locks a project or package.
|
||||
|
||||
@ -3542,7 +3544,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
|
||||
lock = ET.SubElement(root, 'lock')
|
||||
ET.SubElement(lock, 'enable')
|
||||
meta = ET.tostring(root)
|
||||
edit_meta(kind, path_args=path_args, data=meta)
|
||||
edit_meta(kind, path_args=path_args, data=meta, msg=opts.message)
|
||||
|
||||
|
||||
@cmdln.option('-m', '--message', metavar='TEXT',
|
||||
@ -6137,7 +6139,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
|
||||
repository, arch, descr = self.parse_repoarchdescr(args, opts.noinit or opts.offline, opts.alternative_project)
|
||||
project = opts.alternative_project or store_read_project('.')
|
||||
if opts.local_package:
|
||||
package = os.path.splitext(descr)[0]
|
||||
package = os.path.splitext(os.path.basename(descr))[0]
|
||||
else:
|
||||
package = store_read_package('.')
|
||||
apihost = urlsplit(self.get_api_url())[1]
|
||||
|
Loading…
Reference in New Issue
Block a user