X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ashley;h=1c4356424a8a3b6b963fb0ae87ea1a527c0e1378;hb=258ca5e76f4c66976b363a00d7bef40d4bd6f277;hp=38ee3ca98f007068d32106ded720ee2fafeccd3d;hpb=e38ec49727ef15c6dcad16f7ebdb56e8e254d568;p=dak.git

diff --git a/ashley b/ashley
index 38ee3ca9..1c435642 100755
--- a/ashley
+++ b/ashley
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Dump variables from a .katie file to stdout
-# Copyright (C) 2001  James Troup <james@nocrew.org>
-# $Id: ashley,v 1.1 2002-02-12 23:08:07 troup Exp $
+# Copyright (C) 2001, 2002  James Troup <james@nocrew.org>
+# $Id: ashley,v 1.6 2002-08-07 17:19:29 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
@@ -18,6 +18,15 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+################################################################################
+
+# <elmo> ooooooooooooooohhhhhhhhhhhhhhhhhhhhhhhhh            dddddddddeeeeeeeaaaaaaaarrrrrrrrrrr
+# <elmo> iiiiiiiiiiiii          tttttttttthhhhhhhhiiiiiiiiiiiinnnnnnnnnkkkkkkkkkkkkk              iiiiiiiiiiiiii       mmmmmmmmmmiiiiiiiisssssssssssssssseeeeeeeddd           uuuupppppppppppp       ttttttttthhhhhhhheeeeeeee          xxxxxxxssssssseeeeeeeeettttttttttttt             aaaaaaaarrrrrrrggggggsssssssss
+#
+# ['xset r rate 30 250' bad, mmkay]
+
+################################################################################
+
 import string, sys;
 import katie, utils;
 
@@ -25,9 +34,7 @@ def main():
     Cnf = utils.get_conf()
     k = katie.Katie(Cnf);
     for arg in sys.argv[1:]:
-        if arg[-8:] != ".changes":
-            utils.warn("Skipping '%s', unknown file type." % (arg));
-            continue;
+        arg = utils.validate_changes_file_arg(arg);
         k.pkg.changes_file = arg;
         print "%s:" % (arg);
 	k.init_vars();
@@ -36,15 +43,15 @@ def main():
         changes = k.pkg.changes;
         print " Changes:";
         # Mandatory changes fields
-        for i in [ "source", "version", "maintainer", "urgency" ]:
+        for i in [ "source", "version", "maintainer", "urgency", "changedby822", "changedbyname", "maintainername", "maintaineremail", "fingerprint" ]:
             print "  %s: %s" % (string.capitalize(i), changes[i]);
             del changes[i];
         # Mandatory changes lists
-        for i in [ "distribution", "architecture" ]:
+        for i in [ "distribution", "architecture", "closes" ]:
             print "  %s: %s" % (string.capitalize(i), string.join(changes[i].keys()));
             del changes[i];
         # Optional changes fields
-        for i in [ "changed-by", "changedby822", "maintainer822", "filecontents" ]:
+        for i in [ "changed-by", "maintainer822", "filecontents", "format" ]:
             if changes.has_key(i):
                 print "  %s: %s" % (string.capitalize(i), changes[i]);
                 del changes[i];
@@ -54,7 +61,7 @@ def main():
 
         dsc = k.pkg.dsc;
         print " Dsc:";
-        for i in [ "source", "version", "maintainer" ]:
+        for i in [ "source", "version", "maintainer", "fingerprint", "uploaders" ]:
             if dsc.has_key(i):
                 print "  %s: %s" % (string.capitalize(i), dsc[i]);
                 del dsc[i];