aboutsummaryrefslogtreecommitdiffstats
path: root/MgaRepo
diff options
context:
space:
mode:
Diffstat (limited to 'MgaRepo')
-rw-r--r--MgaRepo/log.py2
-rw-r--r--MgaRepo/svn.py4
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 \