keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Accept arbitrary refname instead of using os/version/name

Browse Source 
I want to use "fedostree" for now, so let's allow the caller to
specify whatever refname they want.
This commit is contained in:
Colin Walters 2014-01-12 13:46:49 -05:00
parent dd6d65d1f4
commit 8250481b46
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/rpmostree.py
View File

@ -277,6 +277,10 @@ def main():
action='store',
default=None,
help="Sign commits using given GPG key ID")
parser.add_option('', "--name",
action='store',
default=None,
help="Use NAME as ref name")
parser.add_option('', "--os",
action='store', dest='os',
default=None,
@ -298,8 +302,9 @@ def main():
global args
(opts, args) = parser.parse_args(sys.argv[1:])
if (opts.os is None or
opts.os_version is None):
if (opts.deploy and
(opts.os is None or
opts.os_version is None)):
f = open('/etc/os-release')
for line in f.readlines():
if line == '': continue
@ -307,17 +312,16 @@ def main():
os_release_data[k.strip()] = v.strip()
f.close()
if opts.os is None:
opts.os = os_release_data['ID']
if opts.os_version is None:
opts.os_version = os_release_data['VERSION_ID']
if opts.os is None:
opts.os = os_release_data['ID']
if opts.os_version is None:
opts.os_version = os_release_data['VERSION_ID']
log("Targeting os=%s version=%s" % (opts.os, opts.os_version))
action = args[0]
if action == 'create':
branchname = args[1]
ref = '%s/%s/%s' % (opts.os, opts.os_version, branchname)
ref = args[1]
packages = args[2:]
commit_message = 'Commit of %d packages' % (len(packages), )
else: