From: James Troup <james@nocrew.org>
Date: Sun, 21 Jan 2001 18:12:50 +0000 (+0000)
Subject: sync
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=838276ed90228c4a8a3e321ee2ef14f4f0e0c1df;p=dak.git

sync
---

diff --git a/katie b/katie
index df97db7d..103d0b8e 100755
--- a/katie
+++ b/katie
@@ -2,7 +2,7 @@
 
 # Installs Debian packaes
 # Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: katie,v 1.19 2001-01-18 04:51:10 troup Exp $
+# $Id: katie,v 1.20 2001-01-21 18:12:50 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
@@ -105,7 +105,7 @@ def check_signature (filename):
 
     (result, output) = commands.getstatusoutput("gpg --emulate-md-encode-bug --batch --no-options --no-default-keyring --always-trust --keyring=%s --keyring=%s < %s >/dev/null" % (Cnf["Dinstall::PGPKeyring"], Cnf["Dinstall::GPGKeyring"], filename))
     if (result != 0):
-        reject_message = "Rejected: GPG signature check failed on `%s'.\n%s\n" % (filename, output)
+        reject_message = "Rejected: GPG signature check failed on `%s'.\n%s\n" % (os.path.basename(filename), output)
         return 0
     return 1
 
@@ -281,7 +281,10 @@ def check_files():
         # Checks for a binary package...
         elif re_isadeb.match(file) != None:
             # Extract package information using dpkg-deb
-            control = apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(file,"r")))
+            try:
+                control = apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(file,"r")))
+            except:
+                reject_message = reject_message + "Rejected: %s: debExtractControl() raised %s.\n" % (file, sys.exc_type);
 
             # Check for mandatory fields
             if control.Find("Package") == None:
diff --git a/mklslar b/mklslar
index f4fa4f11..fd204588 100755
--- a/mklslar
+++ b/mklslar
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Update the ls-lR.
-# $Id: mklslar,v 1.1 2000-11-24 00:20:11 troup Exp $
+# $Id: mklslar,v 1.2 2001-01-21 18:12:50 troup Exp $
 
 set -e
 . $SCRIPTVARS
@@ -17,7 +17,7 @@ find -type f \( \! -perm -444 -o -perm +002 \) -ls
 find -type d \( \! -perm -555 -o -perm +002 \) -ls
 
 echo "Checking symlinks ..."
-symlinks -r .
+symlinks -rd .
 
 echo "Creating recursive directory listing ... "
 rm -f .$filename.new