overwriting existing files is no good, mmkay? fix chmod 664 on directories.

diff --git a/THANKS b/THANKS
index d8292fbce1cb1ef419e728363432f52095d5a3cc..b190663bfadb2d85004ad39908b7248a990b855c 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -6,7 +6,7 @@ Antti-Juhani Kaijanaho         <ajk@debian.org>
 Brendan O'Dea                 <bod@debian.org>
 Chris Leishman                <masklin@debian.org>
 Drake Diedrich                <dld@debian.org>
-Guy Maor                      <maor@debian.org
+Guy Maor                      <maor@debian.org>
 Jason Gunthorpe                       <jgg@debian.org>
 Michael Beattie                       <mjb@debian.org>
 Robert Bihlmeyer              <robbe@orcus.priv.at>

diff --git a/TODO b/TODO
index f5b7e87f14a0869c334ee04a83c8cb81b711145f..7cf940902f705be6bb31d5a440b790d4cc5a22bb 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,14 +1,13 @@
 Show Stopper
 ------------
 
-  o finish new cron.daily file
+  o finish new cron.daily file for auric
 
   o finish rhona
 
   o Testing... lots of it.
 
   o jenna needs to munge files in stable
-  o need to handle (i.e. not crash, but reject) -sa builds.
 
 Non-Show Stopper
 ----------------

diff --git a/init_pool.sql b/init_pool.sql
index e7bfb87da1c89950b7833b31014476e97a46f689..8da4a79fdebb39bc5b7f9dbec408612e6aeb7187 100644 (file)
--- a/init_pool.sql
+++ b/init_pool.sql
@@ -74,7 +74,7 @@ CREATE TABLE binaries (
        file INT4 UNIQUE NOT NULL, -- REFERENCES files,
        type TEXT NOT NULL,
 -- joeyh@ doesn't want .udebs and .debs with the same name, which is why the unique () doesn't mention type
-       unique (package, version, source, architecture)
+       unique (package, version, architecture)
 );
 
 CREATE TABLE suite (

diff --git a/katie b/katie
index 7ed5dc00d47d6ba33104e2d5096c1b225a320720..574fe1f3468acd6766d77f8b7a5bf311eb5d09dc 100755 (executable)
--- a/katie
+++ b/katie
@@ -2,7 +2,7 @@
 
 # Installs Debian packaes
 # Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: katie,v 1.4 2000-11-27 03:15:26 troup Exp $
+# $Id: katie,v 1.5 2000-11-30 04:19:30 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
@@ -375,6 +375,11 @@ def check_files():
                         else:
                             reject_message = reject_message + "Rejected"
                         reject_message = reject_message + ": %s Old version `%s' >= new version `%s'.\n" % (file, oldfile["version"], files[file]["version"])
+                # Check for existing copies of the file
+                q = projectB.query("SELECT b.id FROM binaries b, architecture a WHERE b.package = '%s' AND b.version = '%s' AND a.arch_string = '%s' AND a.id = b.architecture" % (files[file]["package"], files[file]["version"], files[file]["architecture"]))
+                if q.getresult() != []:
+                    reject_message = reject_message + "Rejected: can not overwrite existing copy of '%s' already in the archive.\n" % (file)
+
             # Find any old .dsc files
             elif files[file]["type"] == "dsc":
                 q = projectB.query("SELECT s.id, s.version, f.filename, l.path, c.name FROM source s, src_associations sa, suite su, location l, component c, files f WHERE s.source = '%s' AND su.suite_name = '%s' AND sa.source = s.id AND sa.suite = su.id AND f.location = l.id AND l.component = c.id AND f.id = s.file"
@@ -438,6 +443,10 @@ def check_dsc ():
                 if files.has_key(dsc_file):
                     actual_md5 = files[dsc_file]["md5sum"]
                     found = "%s in incoming" % (dsc_file)
+                    # Check the file does not already exist in the archive
+                    q = projectB.query("SELECT f.id FROM files f, location l WHERE f.filename ~ '/%s' AND l.id = f.location" % (dsc_file));
+                    if q.getresult() != []:
+                        reject_message = reject_message + "Rejected: can not overwrite existing copy of '%s' already in the archive.\n" % (dsc_file)
                 elif dsc_file[-12:] == ".orig.tar.gz":
                     # Check in Incoming
                     # See comment above process_it() for explanation...
@@ -469,7 +478,7 @@ def check_dsc ():
                     continue;
                 if actual_md5 != dsc_files[dsc_file]["md5sum"]:
                     reject_message = reject_message + "Rejected: md5sum for %s doesn't match %s.\n" % (found, file)
-                
+
     if string.find(reject_message, "Rejected:") != -1:
         return 0
     else: 

diff --git a/utils.py b/utils.py
index 40e36cd9c6a1c79111550a616a72ccb095e6320c..ef86b5adc736f80ed8afd30814236e9f5a144f1a 100644 (file)
--- 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.4 2000-11-27 03:15:26 troup Exp $
+# $Id: utils.py,v 1.5 2000-11-30 04:19:30 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
@@ -206,6 +206,8 @@ def move (src, dest):
        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]):
+       dest = dest + '/' + os.path.basename(src);
     os.chmod(dest, 0664);
     os.unlink(src);
 
@@ -220,6 +222,8 @@ def copy (src, dest):
        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]):
+       dest = dest + '/' + os.path.basename(src);
     os.chmod(dest, 0664);
 
 ######################################################################################