X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ashley;h=e832851f83a97204e97b97db2d6f5a320748b082;hb=2286ce0734fe5dadf2b601165f56d2ebb5a91a5a;hp=756ea5eb7caa1d779c7642a7d4a2865cea8de783;hpb=ab9a8e8058315ff4ab4e0f17b13afce00192ec2c;p=dak.git

diff --git a/ashley b/ashley
index 756ea5eb..e832851f 100755
--- a/ashley
+++ b/ashley
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Dump variables from a .katie file to stdout
-# Copyright (C) 2001, 2002  James Troup <james@nocrew.org>
-# $Id: ashley,v 1.8 2003-01-02 18:10:02 troup Exp $
+# Copyright (C) 2001, 2002, 2004  James Troup <james@nocrew.org>
+# $Id: ashley,v 1.11 2004-11-27 16:05:12 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
@@ -58,7 +58,7 @@ def main():
 
     k = katie.Katie(Cnf);
     for arg in sys.argv[1:]:
-        arg = utils.validate_changes_file_arg(arg);
+        arg = utils.validate_changes_file_arg(arg,require_changes=-1);
         k.pkg.changes_file = arg;
         print "%s:" % (arg);
 	k.init_vars();
@@ -67,7 +67,10 @@ def main():
         changes = k.pkg.changes;
         print " Changes:";
         # Mandatory changes fields
-        for i in [ "source", "version", "maintainer", "urgency", "changedby822", "changedbyname", "maintainername", "maintaineremail", "fingerprint" ]:
+        for i in [ "source", "version", "maintainer", "urgency", "changedby822",
+                   "changedby2047", "changedbyname", "maintainer822",
+                   "maintainer2047", "maintainername", "maintaineremail",
+                   "fingerprint", "changes" ]:
             print "  %s: %s" % (i.capitalize(), changes[i]);
             del changes[i];
         # Mandatory changes lists
@@ -75,7 +78,7 @@ def main():
             print "  %s: %s" % (i.capitalize(), " ".join(changes[i].keys()));
             del changes[i];
         # Optional changes fields
-        for i in [ "changed-by", "maintainer822", "filecontents", "format" ]:
+        for i in [ "changed-by", "filecontents", "format" ]:
             if changes.has_key(i):
                 print "  %s: %s" % (i.capitalize(), changes[i]);
                 del changes[i];
@@ -85,7 +88,8 @@ def main():
 
         dsc = k.pkg.dsc;
         print " Dsc:";
-        for i in [ "source", "version", "maintainer", "fingerprint", "uploaders" ]:
+        for i in [ "source", "version", "maintainer", "fingerprint", "uploaders",
+                   "bts changelog" ]:
             if dsc.has_key(i):
                 print "  %s: %s" % (i.capitalize(), dsc[i]);
                 del dsc[i];
@@ -100,7 +104,7 @@ def main():
             for i in [ "package", "version", "architecture", "type", "size",
                        "md5sum", "component", "location id", "source package",
                        "source version", "maintainer", "dbtype", "files id",
-                       "new", "section", "priority" ]:
+                       "new", "section", "priority", "pool name" ]:
                 if files[file].has_key(i):
                     print "   %s: %s" % (i.capitalize(), files[file][i]);
                     del files[file][i];