diff options
| author | Per Øyvind Karlsen <proyvind@moondrake.org> | 2016-06-01 04:23:14 +0200 |
|---|---|---|
| committer | Per Øyvind Karlsen <proyvind@moondrake.org> | 2016-06-01 04:23:14 +0200 |
| commit | be52a32e4719d86251c9c651e0e09510e183e7e9 (patch) | |
| tree | c76996f61f856ce5fcff2e7f7654e7ffe6a9b565 /MgaRepo/commands | |
| parent | 1f3a525507a8f5681a8b478d55dc9346e45ab91d (diff) | |
| download | mgarepo-be52a32e4719d86251c9c651e0e09510e183e7e9.tar mgarepo-be52a32e4719d86251c9c651e0e09510e183e7e9.tar.gz mgarepo-be52a32e4719d86251c9c651e0e09510e183e7e9.tar.bz2 mgarepo-be52a32e4719d86251c9c651e0e09510e183e7e9.tar.xz mgarepo-be52a32e4719d86251c9c651e0e09510e183e7e9.zip | |
use (dated) mageia user map from svn-git-migration metadata
Diffstat (limited to 'MgaRepo/commands')
| -rw-r--r-- | MgaRepo/commands/getsrpm.py | 3 | ||||
| -rw-r--r-- | MgaRepo/commands/rpmlog.py | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/MgaRepo/commands/getsrpm.py b/MgaRepo/commands/getsrpm.py index 82bd626..5eb630b 100644 --- a/MgaRepo/commands/getsrpm.py +++ b/MgaRepo/commands/getsrpm.py @@ -30,6 +30,7 @@ Options: -n Rename the package to include the revision number -l Use subversion log to build rpm %changelog -T FILE Template to be used to generate the %changelog + -F Do not use full name & email for packagers in %changelog -M Do not use the mirror (use the main repository) -h Show this message --strict Check if the given revision contains changes in REPPKGURL @@ -76,6 +77,8 @@ def parse_options(): parser.add_option("-n", dest="revname", action="store_true") parser.add_option("-l", dest="svnlog", action="store_true") parser.add_option("-T", dest="template", type="string", default=None) + parser.add_option("-F", dest="fullnames", default=True, + action="store_false") parser.add_option("-M", "--no-mirror", action="callback", callback=disable_mirror) parser.add_option("--strict", dest="strict", default=False, diff --git a/MgaRepo/commands/rpmlog.py b/MgaRepo/commands/rpmlog.py index 2b62925..28d66f1 100644 --- a/MgaRepo/commands/rpmlog.py +++ b/MgaRepo/commands/rpmlog.py @@ -25,6 +25,7 @@ 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,13 +46,15 @@ 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): +def rpmlog(pkgdirurl, revision, size, template, oldlog, usespec, sort, fullnames): another = None if usespec: svn = SVN() @@ -59,7 +62,7 @@ def rpmlog(pkgdirurl, revision, size, template, oldlog, usespec, sort): 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) + 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") |