First implementation of make-changelog command

[dak.git] / daklib / queue.py

diff --git a/daklib/queue.py b/daklib/queue.py
index dd654cd2d67e06162057c348b4c4e461c70a3438..c177602c3c55bf627af9258048419ecfc6f03861 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -231,17 +231,6 @@ def check_valid(new):
 
 ###############################################################################
 
-def check_status(files):
-    new = byhand = 0
-    for f in files.keys():
-        if files[f].has_key("byhand"):
-            byhand = 1
-        elif files[f].has_key("new"):
-            new = 1
-    return (new, byhand)
-
-###############################################################################
-
 # Used by Upload.check_timestamps
 class TarTime(object):
     def __init__(self, future_cutoff, past_cutoff):
@@ -364,8 +353,8 @@ class Upload(object):
         Load a changes file and setup a dictionary around it. Also checks for mandantory
         fields  within.
 
-        @type: string
-        @param: Changes filename, full path.
+        @type filename: string
+        @param filename: Changes filename, full path.
 
         @rtype: boolean
         @return: whether the changes file was valid or not.  We may want to
@@ -940,7 +929,7 @@ class Upload(object):
 
         # Parse the .dsc file
         try:
-            self.pkg.dsc.update(utils.parse_changes(dsc_filename, signing_rules=1))
+            self.pkg.dsc.update(utils.parse_changes(dsc_filename, signing_rules=1, dsc_file=1))
         except CantOpenError:
             # if not -n copy_to_holding() will have done this for us...
             if not action:
@@ -1236,7 +1225,7 @@ class Upload(object):
             found = False
 
             # Look in the pool
-            for poolfile in get_poolfile_like_name('/%s' % filename, session_):
+            for poolfile in get_poolfile_like_name('%s' % filename, session_):
                 poolfile_path = os.path.join(
                     poolfile.location.path, poolfile.filename
                 )