X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=jenna;h=7e7f2f36f294dfcc2d2ed3add99b80543bb8fb80;hb=a60c72b16695992b92f6acf88381d5ae8ce9335f;hp=e346e69b0c1d891a5e83738110609dab4076682e;hpb=156a0cb3726a88995d4ef275002d741689dfb84c;p=dak.git

diff --git a/jenna b/jenna
index e346e69b..7e7f2f36 100755
--- a/jenna
+++ b/jenna
@@ -2,7 +2,7 @@
 
 # Generate file lists used by apt-ftparchive to generate Packages and Sources files
 # Copyright (C) 2000, 2001, 2002, 2003, 2004  James Troup <james@nocrew.org>
-# $Id: jenna,v 1.26 2004-01-21 03:22:23 troup Exp $
+# $Id: jenna,v 1.28 2004-06-17 15:02:02 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
@@ -117,7 +117,7 @@ def resolve_arch_all_vs_any(versions, packages):
     delete_table = "bin_associations";
     delete_col = "bin";
 
-    if apt_pkg.VersionCompare(highest_arch_any_version, arch_all_version) != 1:
+    if apt_pkg.VersionCompare(highest_arch_any_version, arch_all_version) < 1:
         # arch: all dominates
         delete_packages(arch_any_versions, pkg, "all", suite,
                         arch_all_version, delete_table, delete_col, packages);
@@ -350,7 +350,11 @@ def stable_dislocation_p():
         return 1;
     # Otherwise, look in what suites the user specified
     suites = Options["Suite"].split();
-    return suites.count("stable");
+
+    if "stable" in suites:
+        return 1;
+    else:
+        return 0;
 
 ################################################################################