From: Torsten Werner <twerner@debian.org>
Date: Sat, 5 Mar 2011 10:50:37 +0000 (+0000)
Subject: bugfixes
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;ds=sidebyside;h=9ca85bf3b8790a8d9e1daa4a9dd70019f55f6e08;p=dak.git

bugfixes

Signed-off-by: Torsten Werner <twerner@debian.org>
---

diff --git a/daklib/contents.py b/daklib/contents.py
index 6aadb66e..840cb681 100755
--- a/daklib/contents.py
+++ b/daklib/contents.py
@@ -32,7 +32,7 @@ from daklib.threadpool import ThreadPool
 from sqlalchemy import desc, or_
 from subprocess import Popen, PIPE
 
-import os
+import os.path
 
 class ContentsWriter(object):
     '''
@@ -130,7 +130,7 @@ select bc.file, substring(o.section from position('/' in o.section) + 1) || '/'
         Returns a formatted string for the filename argument.
         '''
         package_list = ','.join(package_list)
-        return "%-60s%s\n" % (filename, package_list)
+        return "%-55s %s\n" % (filename, package_list)
 
     def fetch(self):
         '''
@@ -173,8 +173,9 @@ select bc.file, substring(o.section from position('/' in o.section) + 1) || '/'
         '''
         Returns the header for the Contents files as a string.
         '''
+        header_file = None
         try:
-            filename = os.join(Config()['Dir::Templates'], 'contents')
+            filename = os.path.join(Config()['Dir::Templates'], 'contents')
             header_file = open(filename)
             return header_file.read()
         finally: