X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=jennifer;h=9ea014854f01a979e470952c04f60480e7b52248;hb=012c7585d4a39798f35a487eda5110ff653de133;hp=3da7f8f2a356ad463826e2c5cacf43221584548e;hpb=b51815ac34b619062cff7a6633ad43e6af255917;p=dak.git

diff --git a/jennifer b/jennifer
index 3da7f8f2..9ea01485 100755
--- a/jennifer
+++ b/jennifer
@@ -2,7 +2,7 @@
 
 # Checks Debian packages from Incoming
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: jennifer,v 1.19 2002-05-14 22:28:01 troup Exp $
+# $Id: jennifer,v 1.21 2002-05-19 00:47:16 troup Exp $
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@ re_is_changes = re.compile (r"(.+?)_(.+?)_(.+?)\.changes$");
 ################################################################################
 
 # Globals
-jennifer_version = "$Revision: 1.19 $";
+jennifer_version = "$Revision: 1.21 $";
 
 Cnf = None;
 Options = None;
@@ -311,7 +311,7 @@ def copy_to_holding(filename):
     try:
         shutil.copy(filename, dest);
     except IOError, e:
-        # In either case (ENOENT or EPERM) we want to remove the
+        # In either case (ENOENT or EACCES) we want to remove the
         # O_CREAT | O_EXCLed ghost file, so add the file to the list
         # of 'in holding' even if it's not the real file.
         if errno.errorcode[e.errno] == 'ENOENT':
@@ -355,7 +355,7 @@ def check_changes():
 
     # Parse the .changes field into a dictionary
     try:
-        changes.update(utils.parse_changes(filename, 0));
+        changes.update(utils.parse_changes(filename));
     except utils.cant_open_exc:
         reject("can't read changes file '%s'." % (filename));
         return 0;
@@ -365,7 +365,7 @@ def check_changes():
 
     # Parse the Files field from the .changes into another dictionary
     try:
-        files.update(utils.build_file_list(changes, ""));
+        files.update(utils.build_file_list(changes));
     except utils.changes_parse_error_exc, line:
         reject("error parsing changes file '%s', can't grok: %s." % (filename, line));
     except utils.nk_format_exc, format:
@@ -713,7 +713,7 @@ def check_dsc ():
         if files[file]["type"] == "dsc":
             # Parse the .dsc file
             try:
-                dsc.update(utils.parse_changes(file, 1));
+                dsc.update(utils.parse_changes(file, dsc_whitespace_rules=1));
             except utils.cant_open_exc:
                 # if not -n copy_to_holding() will have done this for us...
                 if Options["No-Action"]:
@@ -724,7 +724,7 @@ def check_dsc ():
                 reject("syntax error in .dsc file '%s', line %s." % (file, line));
             # Build up the file list of files mentioned by the .dsc
             try:
-                dsc_files.update(utils.build_file_list(dsc, 1));
+                dsc_files.update(utils.build_file_list(dsc, is_a_dsc=1));
             except utils.no_files_exc:
                 reject("no Files: field in .dsc file.");
                 continue;