diff --git a/osc/commandline.py b/osc/commandline.py index e46b16b4..14eb4990 100755 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -1400,6 +1400,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. print ''.join(show_results_meta(pac.apiurl, pac.prjname, package=pac.name)) + @cmdln.alias('r') def do_results(self, subcmd, opts, *args): """${cmd_name}: Shows the build results of a package @@ -1440,6 +1441,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. @cmdln.option('-n', '--name-filter', metavar='EXPR', help='show only packages whos name matches EXPR') + @cmdln.alias('pr') def do_prjresults(self, subcmd, opts, *args): """${cmd_name}: Shows project-wide build results diff --git a/osc/core.py b/osc/core.py index 36078c22..ee156249 100755 --- a/osc/core.py +++ b/osc/core.py @@ -1805,7 +1805,7 @@ def read_meta_from_spec(specfile, *args): def edit_message(footer=''): delim = '--This line, and those below, will be ignored--\n\n' + footer import tempfile - (fd, filename) = tempfile.mkstemp(prefix = 'osc-commitmsg', suffix = '.txt', dir = '/tmp') + (fd, filename) = tempfile.mkstemp(prefix = 'osc-commitmsg', suffix = '.diff', dir = '/tmp') f = os.fdopen(fd, 'w') f.write('\n') f.write(delim) @@ -2666,9 +2666,9 @@ def get_buildhistory(apiurl, prj, package, platform, arch): t = time.localtime(int(node.get('time'))) t = time.strftime('%Y-%m-%d %H:%M:%S', t) - r.append('%s %s %6d %2d %s' % (t, srcmd5, rev, bcnt, versrel)) + r.append('%s %s %6d %s.%d' % (t, srcmd5, rev, versrel, bcnt)) - r.insert(0, 'time srcmd5 rev bcnt vers-rel') + r.insert(0, 'time srcmd5 rev vers-rel.bcnt') return r