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

dist/ci/flake-extra: include osc-origin.py in product grep.

Browse Source
This commit is contained in:
Jimmy Berry 2019-05-01 15:41:57 -05:00
parent 70a70a3983
commit 83c170660f
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/ci/flake-extra vendored
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
# Should never contain references to products. # Should never contain references to products.
! grep -iP 'leap|factory|sle' origin-manager.py osclib/origin.py ! grep -iP 'leap|factory|sle' origin-manager.py osc-origin.py osclib/origin.py

9
osc-origin.py
View File

@ -33,7 +33,7 @@ OSRT_ORIGIN_LOOKUP_TTL = 60 * 60 * 24 * 7
@cmdln.option('--format', default='plain', help='output format') @cmdln.option('--format', default='plain', help='output format')
@cmdln.option('--mail', action='store_true', help='mail report to <confg:mail-release-list>') @cmdln.option('--mail', action='store_true', help='mail report to <confg:mail-release-list>')
@cmdln.option('--origins-only', action='store_true', help='list origins instead of expanded config') @cmdln.option('--origins-only', action='store_true', help='list origins instead of expanded config')
@cmdln.option('-p', '--project', help='project on which to operate (default is openSUSE:Factory)') @cmdln.option('-p', '--project', help='project on which to operate')
def do_origin(self, subcmd, opts, *args): def do_origin(self, subcmd, opts, *args):
"""${cmd_name}: tools for working with origin information """${cmd_name}: tools for working with origin information
@ -66,15 +66,14 @@ def do_origin(self, subcmd, opts, *args):
logging.basicConfig(level=level, format='[%(levelname).1s] %(message)s') logging.basicConfig(level=level, format='[%(levelname).1s] %(message)s')
# Allow for determining project from osc store. # Allow for determining project from osc store.
if not opts.project: if not opts.project and core.is_project_dir('.'):
if core.is_project_dir('.'):
opts.project = core.store_read_project('.') opts.project = core.store_read_project('.')
else:
opts.project = 'openSUSE:Factory'
Cache.init() Cache.init()
apiurl = self.get_api_url() apiurl = self.get_api_url()
if command != 'projects': if command != 'projects':
if not opts.project:
raise oscerr.WrongArgs('A project must be indicated.')
config = config_load(apiurl, opts.project) config = config_load(apiurl, opts.project)
if not config: if not config:
raise oscerr.WrongArgs('OSRT:OriginConfig attribute missing from {}'.format(opts.project)) raise oscerr.WrongArgs('OSRT:OriginConfig attribute missing from {}'.format(opts.project))