diff options
| author | Papoteur <papoteur@mageialinux-online.org> | 2015-11-01 09:58:57 +0100 |
|---|---|---|
| committer | Papoteur <papoteur@mageialinux-online.org> | 2015-11-01 09:58:57 +0100 |
| commit | a1efeb369bbd4400521bab3278f229ab06c4e696 (patch) | |
| tree | e6f87b4de375638726094c7a2808993dae51322c | |
| parent | 084bc8323ec44ce3a88f074e23ad90ed21a24f38 (diff) | |
| download | mgarepo-a1efeb369bbd4400521bab3278f229ab06c4e696.tar mgarepo-a1efeb369bbd4400521bab3278f229ab06c4e696.tar.gz mgarepo-a1efeb369bbd4400521bab3278f229ab06c4e696.tar.bz2 mgarepo-a1efeb369bbd4400521bab3278f229ab06c4e696.tar.xz mgarepo-a1efeb369bbd4400521bab3278f229ab06c4e696.zip | |
Suppress a void line in default template for changelog. Suppress a debug info.
| -rw-r--r-- | MgaRepo/log.py | 2 | ||||
| -rw-r--r-- | MgaRepo/svn.py | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/MgaRepo/log.py b/MgaRepo/log.py index cbf7d13..fa7ac62 100644 --- a/MgaRepo/log.py +++ b/MgaRepo/log.py @@ -334,7 +334,6 @@ def dump_file(releases, currentlog=None, template=None): for line in rev.lines: draft = draft + line + "\n" draft += "\n" - draft += "\n" return draft class InvalidEntryError(Exception): @@ -617,7 +616,6 @@ def specfile_svn2rpm(pkgdirurl, specfile, rev=None, size=None, chlog = get_changelog(pkgdirurl, another=another, rev=rev, size=size, submit=submit, sort=sort, template=template, macros=macros, exported=exported, oldlog=True) - print(spec) with open(specfile, "w", encoding='utf-8') as fo: fo.writelines(spec) fo.write("\n\n%changelog\n") diff --git a/MgaRepo/svn.py b/MgaRepo/svn.py index 50d7498..ca880e1 100644 --- a/MgaRepo/svn.py +++ b/MgaRepo/svn.py @@ -44,12 +44,12 @@ class SVN: except Error as e: msg = None if e.args: - if b"Permission denied" in e.args[0]: + if "Permission denied" in e.args[0]: msg = ("It seems ssh-agent or ForwardAgent are not setup " "or your username is wrong. See " "https://wiki.mageia.org/en/Packagers_ssh" " for more information.") - elif b"authorization failed" in e.args[0]: + elif "authorization failed" in e.args[0]: msg = ("Note that mgarepo does not support any HTTP " "authenticated access.") if kwargs.get("show") and \ |