X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=charisma;h=b9eae14704e14783a07bb08a835b8e5e58abb3a1;hb=9540d873fa78598454af57f5f8a4875969ed0439;hp=04ef3ecb9b5eac91164d53a43afb1108ac224d9e;hpb=ec44b1937e42da2e89e0c2e5c027fc963e81a4ea;p=dak.git

diff --git a/charisma b/charisma
index 04ef3ecb..b9eae147 100755
--- a/charisma
+++ b/charisma
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Generate Maintainers file used by e.g. the Debian Bug Tracking System
-# Copyright (C) 2000, 2001, 2002, 2003  James Troup <james@nocrew.org>
-# $Id: charisma,v 1.16 2003-04-15 16:03:31 troup Exp $
+# Copyright (C) 2000, 2001, 2002, 2003, 2004  James Troup <james@nocrew.org>
+# $Id: charisma,v 1.18 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
@@ -104,7 +104,7 @@ def main():
             maintainer = fix_maintainer(source[2]);
             if packages.has_key(package):
                 if packages[package]["priority"] <= suite_priority:
-                    if apt_pkg.VersionCompare(packages[package]["version"], version) == -1:
+                    if apt_pkg.VersionCompare(packages[package]["version"], version) < 0:
                         packages[package] = { "maintainer": maintainer, "priority": suite_priority, "version": version };
             else:
                 packages[package] = { "maintainer": maintainer, "priority": suite_priority, "version": version };
@@ -117,13 +117,13 @@ def main():
             source_id = binary[1];
             version = binary[3];
             # Use the source maintainer first; falling back on the binary maintainer as a last resort only
-            if source_id != 0 and source_id != None:
+            if source_id:
                 maintainer = get_maintainer_from_source(source_id);
             else:
                 maintainer = get_maintainer(binary[2]);
             if packages.has_key(package):
                 if packages[package]["priority"] <= suite_priority:
-                    if apt_pkg.VersionCompare(packages[package]["version"], version) == -1:
+                    if apt_pkg.VersionCompare(packages[package]["version"], version) < 0:
                         packages[package] = { "maintainer": maintainer, "priority": suite_priority, "version": version };
             else:
                 packages[package] = { "maintainer": maintainer, "priority": suite_priority, "version": version };
@@ -145,7 +145,7 @@ def main():
                 version = '*';
             # A version of '*' overwhelms all real version numbers
             if not packages.has_key(package) or version == '*' \
-               or apt_pkg.VersionCompare(packages[package]["version"], version) == -1:
+               or apt_pkg.VersionCompare(packages[package]["version"], version) < 0:
                 packages[package] = { "maintainer": maintainer, "version": version };
         file.close();