diff options
Diffstat (limited to 'MgaRepo/commands/rpmlog.py')
| -rw-r--r-- | MgaRepo/commands/rpmlog.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/MgaRepo/commands/rpmlog.py b/MgaRepo/commands/rpmlog.py index 693fe8b..88dfc4b 100644 --- a/MgaRepo/commands/rpmlog.py +++ b/MgaRepo/commands/rpmlog.py @@ -1,3 +1,4 @@ +#!/usr/bin/python # # This program will convert the output of "svn log" to be suitable # for usage in an rpm %changelog session. @@ -24,7 +25,6 @@ Options: -p Append changelog found in .spec file -s Sort changelog entries, even from the old log -M Do not use the mirror (use the main repository) - -F Do not use full name & email for packagers where available -h Show this message Examples: @@ -45,15 +45,13 @@ def parse_options(): action="store_true") parser.add_option("-M", "--no-mirror", action="callback", callback=disable_mirror) - parser.add_option("-F", dest="fullnames", default=True, - action="store_false") opts, args = parser.parse_args() if len(args) != 1: raise Error("invalid arguments") opts.pkgdirurl = layout.package_url(args[0]) return opts -def rpmlog(pkgdirurl, revision, size, template, oldlog, usespec, sort, fullnames): +def rpmlog(pkgdirurl, revision, size, template, oldlog, usespec, sort): another = None if usespec: svn = SVN() @@ -61,10 +59,7 @@ def rpmlog(pkgdirurl, revision, size, template, oldlog, usespec, sort, fullnames rawspec = svn.cat(specurl, rev=revision) spec, another = split_spec_changelog(StringIO(rawspec)) newlog = get_changelog(pkgdirurl, another=another, rev=revision, - size=size, sort=sort, template=template, oldlog=oldlog, fullnames=fullnames) - # make sure stdout support unicode, otherwise it'll croak when encountered - if not "UTF-8" in sys.stdout.encoding: - sys.stdout = open(sys.stdout.fileno(), mode="w", encoding="UTF-8") + size=size, sort=sort, template=template, oldlog=oldlog) sys.stdout.writelines(newlog) def main(): |