Your message dated Fri, 11 Sep 2015 00:03:10 +0100
with message-id
<1441926190.1599365.380366513.5fcba...@webmail.messagingengine.com>
and subject line
has caused the Debian Bug report #796786,
regarding dak: Misc cosmetic improvements to error messages, etc.
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
796786: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=796786
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: ftp.debian.org
Severity: wishlist
User: [email protected]
Usertags: dak
Hi,
Cherry-picked working on another feature to keep that minimal, attached
are a bunch of patches of some misc cosmetic fixes to error messages,
etc. that I came across when attempting to setup a local dak instance.
Let me know if you'd like these in separate bugs next time (they seemed
a little too small).
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` [email protected] / chris-lamb.co.uk
`-
From 3918112e1b75f32fb34a9cd5a6528129f47f78b5 Mon Sep 17 00:00:00 2001
From: Chris Lamb <[email protected]>
Date: Mon, 24 Aug 2015 04:05:55 +0200
Subject: [PATCH 5/5] daklib/utils.py: mandantory -> mandatory spelling error
Signed-off-by: Chris Lamb <[email protected]>
---
daklib/utils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daklib/utils.py b/daklib/utils.py
index 2cf6871..518d66e 100644
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -276,7 +276,7 @@ def parse_changes(filename, signing_rules=0, dsc_file=0, keyrings=None):
missingfields.append(keyword)
if len(missingfields):
- raise ParseChangesError("Missing mandantory field(s) in changes file (policy 5.5): %s" % (missingfields))
+ raise ParseChangesError("Missing mandatory field(s) in changes file (policy 5.5): %s" % (missingfields))
return changes
--
2.5.0
From 94a30eeb0a8fdf36b43685740a718ba13b1f692f Mon Sep 17 00:00:00 2001
From: Chris Lamb <[email protected]>
Date: Mon, 24 Aug 2015 03:41:46 +0200
Subject: [PATCH 4/5] daliblib/dak_exceptions: Add trailing comma to avoid
future VCS noise
Signed-off-by: Chris Lamb <[email protected]>
---
daklib/dak_exceptions.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daklib/dak_exceptions.py b/daklib/dak_exceptions.py
index ef24fd7..e111afd 100644
--- a/daklib/dak_exceptions.py
+++ b/daklib/dak_exceptions.py
@@ -62,7 +62,7 @@ dakerrors = {
"DBUpdateError": """Exception raised - could not update the database""",
"ChangesUnicodeError": """Exception raised - changes file not properly utf-8 encoded""",
"AlreadyLockedError": """Exception raised - package already locked by someone else""",
- "CantGetLockError": """Exception raised - lockfile already in use"""
+ "CantGetLockError": """Exception raised - lockfile already in use""",
} #: All dak exceptions
def construct_dak_exception(name, description):
--
2.5.0
From 8b8e870f5058e4c229a1f294ce3a4560f1a77da4 Mon Sep 17 00:00:00 2001
From: Chris Lamb <[email protected]>
Date: Mon, 24 Aug 2015 03:28:05 +0200
Subject: [PATCH 3/5] tests/test_packagelist.py: make executable
---
tests/test_packagelist.py | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 tests/test_packagelist.py
diff --git a/tests/test_packagelist.py b/tests/test_packagelist.py
old mode 100644
new mode 100755
--
2.5.0
From f3494005935adb6008265e9232e87077ca10db1d Mon Sep 17 00:00:00 2001
From: Chris Lamb <[email protected]>
Date: Mon, 24 Aug 2015 03:24:29 +0200
Subject: [PATCH 2/5] dalkib/dbconn.py: Mention which version is installed in
sqlalchemy check
---
daklib/dbconn.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 2d10eff..e762ef7 100644
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -113,7 +113,7 @@ if sa_major_version in ["0.5", "0.6", "0.7", "0.8", "0.9"]:
from sqlalchemy.databases import postgres
postgres.ischema_names['debversion'] = DebVersion
else:
- raise Exception("dak only ported to SQLA versions 0.5 to 0.9. See daklib/dbconn.py")
+ raise Exception("dak only ported to SQLA versions 0.5 to 0.9 (%s installed). See daklib/dbconn.py" % sa_major_version)
################################################################################
--
2.5.0
From 674da3c3291b908f31cc9bf760112cc388862a84 Mon Sep 17 00:00:00 2001
From: Chris Lamb <[email protected]>
Date: Mon, 24 Aug 2015 03:23:49 +0200
Subject: [PATCH 1/5] dak/copy_installer.py: Include which directory doesn't
exist in exception
Signed-off-by: Chris Lamb <[email protected]>
---
dak/copy_installer.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dak/copy_installer.py b/dak/copy_installer.py
index c70b048..2e8a048 100755
--- a/dak/copy_installer.py
+++ b/dak/copy_installer.py
@@ -92,7 +92,7 @@ class InstallerCopier:
def check_dir(self, dir, message):
if not os.path.isdir(dir):
- raise IOError(message)
+ raise IOError("%s (%s)" % (message, dir))
def check_architecture(self, arch_dir):
architecture = re.sub('.*?/installer-(.*?)/.*', r'\1', arch_dir)
--
2.5.0
--- End Message ---
--- Begin Message ---
(merged)
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` [email protected] / chris-lamb.co.uk
`-
--- End Message ---
