yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #867 from jberry-suse/project-from-dir

Browse Source 
osc-staging: provide project from directory functionality.
This commit is contained in:
Jimmy Berry 2017-05-03 19:24:25 -05:00 committed by GitHub
commit 1a979d7e63
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
docs/staging.asciidoc
View File

@ -50,6 +50,33 @@ cd osc-plugin-factory
ln -sr ./osc-staging.py ./osclib ~/.osc-plugins
--------------------------------------------------------------------------------
Optionally, one can create directories for each project of interest in order to
alleviate the need to use the +--project option+ for each command. For example:
--------------------------------------------------------------------------------
# Or use a directory already initialized by osc.
mkdir -p "openSUSE:Leap:42.3/.osc"
cd "openSUSE:Leap:42.3"
echo openSUSE:Leap:42.3 > .osc/_project
# runs against openSUSE:Leap:42.3
osc staging list
# runs against openSUSE:Factory
osc staging -p Factory list
--------------------------------------------------------------------------------
The following snippet may be useful for addition to a bash PS1.
--------------------------------------------------------------------------------
if [ -f .osc/_project ] ; then
echo " <<$(head -n 1 .osc/_project)>> \$ ";
fi
--------------------------------------------------------------------------------
This provides a clear indication of the project against which the commands will
run and can be merged with an existing complex PS1.
Command line
------------

10
osc-staging.py
View File

@ -29,6 +29,7 @@ from colorama import ansi
from osc import cmdln
from osc import conf
from osc import core
from osc import oscerr
from osclib.accept_command import AcceptCommand
@ -86,7 +87,7 @@ def _full_project_name(self, project):
help='replace staged requests when superseded')
@cmdln.option('-f', '--from', dest='from_', metavar='FROMPROJECT',
help='specify a source project when moving a request')
@cmdln.option('-p', '--project', dest='project', metavar='PROJECT', default='Factory',
@cmdln.option('-p', '--project', dest='project', metavar='PROJECT',
help='indicate the project on which to operate, default is openSUSE:Factory')
@cmdln.option('--add', dest='add', metavar='PACKAGE',
help='mark additional packages to be checked by repo checker')
@ -325,6 +326,13 @@ def do_staging(self, subcmd, opts, *args):
if max_args is not None and len(args) - 1 > max_args:
raise oscerr.WrongArgs('Too many arguments.')
# Allow for determining project from osc store.
if not opts.project:
if core.is_project_dir('.'):
opts.project = core.store_read_project('.')
else:
opts.project = 'Factory'
# Init the OBS access and configuration
opts.project = self._full_project_name(opts.project)
opts.apiurl = self.get_api_url()