X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils.py;h=5089f203710a7e7b33e01a2d2add408d5c0abfcb;hb=128efbec918878ff597f09d39779bdf37844149d;hp=81454d4435cbb188386499c2bb8bd2a23a165313;hpb=08d80b7669f2aef2dc031c1378312446be8b3b1e;p=dak.git

diff --git a/utils.py b/utils.py
index 81454d44..5089f203 100644
--- a/utils.py
+++ b/utils.py
@@ -1,6 +1,6 @@
 # Utility functions
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: utils.py,v 1.42 2002-05-08 11:13:44 troup Exp $
+# $Id: utils.py,v 1.46 2002-05-23 12:36:15 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
@@ -123,7 +123,7 @@ def extract_component_from_section(section):
 # o The data section must end with a blank line and must be followed by
 #   "-----BEGIN PGP SIGNATURE-----".
 
-def parse_changes(filename, dsc_whitespace_rules):
+def parse_changes(filename, dsc_whitespace_rules=0):
     changes_in = open_file(filename);
     error = "";
     changes = {};
@@ -199,12 +199,12 @@ def parse_changes(filename, dsc_whitespace_rules):
 
 # Dropped support for 1.4 and ``buggy dchanges 3.4'' (?!) compared to di.pl
 
-def build_file_list(changes, dsc):
+def build_file_list(changes, is_a_dsc=0):
     files = {}
     format = changes.get("format", "")
     if format != "":
 	format = float(format)
-    if dsc == "" and (format < 1.5 or format > 2.0):
+    if not is_a_dsc and (format < 1.5 or format > 2.0):
 	raise nk_format_exc, format;
 
     # No really, this has happened.  Think 0 length .dsc file.
@@ -217,7 +217,7 @@ def build_file_list(changes, dsc):
         s = string.split(i)
         section = priority = "";
         try:
-            if dsc != "":
+            if is_a_dsc:
                 (md5, size, name) = s
             else:
                 (md5, size, section, priority, name) = s
@@ -379,7 +379,7 @@ def regex_safe (s):
 ######################################################################################
 
 # Perform a substition of template
-def TemplateSubst(map,filename):
+def TemplateSubst(map, filename):
     file = open_file(filename);
     template = file.read();
     for x in map.keys():
@@ -425,33 +425,22 @@ def cc_fix_changes (changes):
     for j in string.split(o):
         changes["architecture"][j] = 1
 
-# Sort by 'have source', by source name, by source version number, by filename
-
+# Sort by source name, source version, 'have source', and then by filename
 def changes_compare (a, b):
     try:
-        a_changes = parse_changes(a, 0)
+        a_changes = parse_changes(a);
     except:
         return -1;
 
     try:
-        b_changes = parse_changes(b, 0)
+        b_changes = parse_changes(b);
     except:
         return 1;
 
     cc_fix_changes (a_changes);
     cc_fix_changes (b_changes);
 
-    # Sort by 'have source'
-
-    a_has_source = a_changes["architecture"].get("source")
-    b_has_source = b_changes["architecture"].get("source")
-    if a_has_source and not b_has_source:
-        return -1;
-    elif b_has_source and not a_has_source:
-        return 1;
-
     # Sort by source name
-
     a_source = a_changes.get("source");
     b_source = b_changes.get("source");
     q = cmp (a_source, b_source);
@@ -459,15 +448,21 @@ def changes_compare (a, b):
         return q;
 
     # Sort by source version
-
     a_version = a_changes.get("version");
     b_version = b_changes.get("version");
     q = apt_pkg.VersionCompare(a_version, b_version);
     if q:
-        return q
+        return q;
 
-    # Fall back to sort by filename
+    # Sort by 'have source'
+    a_has_source = a_changes["architecture"].get("source");
+    b_has_source = b_changes["architecture"].get("source");
+    if a_has_source and not b_has_source:
+        return -1;
+    elif b_has_source and not a_has_source:
+        return 1;
 
+    # Fall back to sort by filename
     return cmp(a, b);
 
 ################################################################################
@@ -508,6 +503,33 @@ def prefix_multi_line_string(str, prefix):
 
 ################################################################################
 
+def validate_changes_file_arg(file, fatal=1):
+    error = None;
+
+    orig_filename = file
+    if file[-6:] == ".katie":
+        file = file[:-6]+".changes";
+
+    if file[-8:] != ".changes":
+        error = "invalid file type; not a changes file";
+    else:
+        if not os.access(file,os.R_OK):
+            if os.path.exists(file):
+                error = "permission denied";
+            else:
+                error = "file not found";
+
+    if error:
+        if fatal:
+            fubar("%s: %s." % (orig_filename, error));
+        else:
+            warn("Skipping %s - %s" % (orig_filename, error));
+            return None;
+    else:
+        return file;
+
+################################################################################
+
 def get_conf():
 	return Cnf;