X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils.py;h=8a8c8e93440a22d4c39b881930dd8a1a515ccb28;hb=4b41dc06229eed89f52f397fc7df5d665fa092cf;hp=409113ef93da6dad8084e3245d088fe995c6e0d4;hpb=51cf796601da7d2fc65c8f9ad8d0fe0fa580dba2;p=dak.git

diff --git a/utils.py b/utils.py
index 409113ef..8a8c8e93 100644
--- a/utils.py
+++ b/utils.py
@@ -1,6 +1,6 @@
 # Utility functions
 # Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: utils.py,v 1.6 2000-12-01 17:33:29 troup Exp $
+# $Id: utils.py,v 1.11 2001-01-16 21:52:37 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
@@ -29,6 +29,7 @@ nk_format_exc = "Unknown Format: in .changes file";
 no_files_exc = "No Files: field in .dsc file.";
 cant_open_exc = "Can't read file.";
 unknown_hostname_exc = "Unknown hostname";
+cant_overwrite_exc = "Permission denied; can't overwrite existent file."
 	
 ######################################################################################
 
@@ -104,10 +105,13 @@ def build_file_list(changes, dsc):
             break
         s = string.split(i)
         section = priority = component = ""
-        if dsc != "":
-            (md5, size, name) = s
-        else:
-            (md5, size, section, priority, name) = s
+        try:
+            if dsc != "":
+                (md5, size, name) = s
+            else:
+                (md5, size, section, priority, name) = s
+        except ValueError:
+            raise changes_parse_error_exc, i
 
         if section == "": section = "-"
         if priority == "": priority = "-"
@@ -115,7 +119,7 @@ def build_file_list(changes, dsc):
         # What a mess.  FIXME
         if string.find(section, '/') != -1: 
 	    component = string.split(section, '/')[0]
-	if string.lower(component) == "non-us" and string.count(section, '/') > 1:
+	if string.lower(component) == "non-us" and string.count(section, '/') > 0:
             s = string.split(section, '/')[1]
             if s == "main" or s == "non-free" or s == "contrib": # Avoid e.g. non-US/libs
                 component = string.split(section, '/')[0]+ '/' + string.split(section, '/')[1]
@@ -188,6 +192,9 @@ def send_mail (message, filename):
 def poolify (source, component):
     if component != "":
 	component = component + '/';
+    # FIXME: this is nasty
+    component = string.lower(component);
+    component = string.replace(component, 'non-us/', 'non-US/');
     if source[:3] == "lib":
 	return component + source[:4] + '/' + source + '/'
     else:
@@ -196,7 +203,7 @@ def poolify (source, component):
 ######################################################################################
 
 def move (src, dest):
-    if os.path.exists(dest) and stat.S_ISDIR(os.stat(dest)[stat.ST_MODE]):
+    if os.path.exists(dest) and os.path.isdir(dest):
 	dest_dir = dest;
     else:
 	dest_dir = os.path.dirname(dest);
@@ -205,14 +212,17 @@ def move (src, dest):
 	os.makedirs(dest_dir, 02775);
 	os.umask(umask);
     #print "Moving %s to %s..." % (src, dest);
-    shutil.copy2(src, dest);
-    if os.path.exists(dest) and stat.S_ISDIR(os.stat(dest)[stat.ST_MODE]):
+    if os.path.exists(dest) and os.path.isdir(dest):
 	dest = dest + '/' + os.path.basename(src);
+    # Check for overwrite permission on existent files
+    if os.path.exists(dest) and not os.access(dest, os.W_OK):
+        raise cant_overwrite_exc
+    shutil.copy2(src, dest);
     os.chmod(dest, 0664);
     os.unlink(src);
 
 def copy (src, dest):
-    if os.path.exists(dest) and stat.S_ISDIR(os.stat(dest)[stat.ST_MODE]):
+    if os.path.exists(dest) and os.path.isdir(dest):
 	dest_dir = dest;
     else:
 	dest_dir = os.path.dirname(dest);
@@ -221,9 +231,11 @@ def copy (src, dest):
 	os.makedirs(dest_dir, 02775);
 	os.umask(umask);
     #print "Copying %s to %s..." % (src, dest);
-    shutil.copy2(src, dest);
-    if os.path.exists(dest) and stat.S_ISDIR(os.stat(dest)[stat.ST_MODE]):
+    if os.path.exists(dest) and os.path.isdir(dest):
 	dest = dest + '/' + os.path.basename(src);
+    if os.path.exists(dest) and not os.access(dest, os.W_OK):
+        raise cant_overwrite_exc
+    shutil.copy2(src, dest);
     os.chmod(dest, 0664);
 
 ######################################################################################
@@ -265,3 +277,12 @@ def regex_safe (s):
 
 ######################################################################################
 
+def size_type (c):
+    t  = " b";
+    if c > 10000:
+        c = c / 1000;
+        t = " Kb";
+    if c > 10000:
+        c = c / 1000;
+        t = " Mb";
+    return ("%d%s" % (c, t))