[Apt-listbugs-commits] [SCM] apt-listbugs development tree branch, master, updated. debian/0.1.2-8-g94d34de

[Ryan Niebur]

The following commit has been merged in the master branch:
commit 8a1e9fc4168c14cc6b57605fef9bd60abc7aeee1
Author: Francesco Poli (t1000) <frx at firenze.linux.it>
Date:   Sun Jan 10 23:48:24 2010 +0100

    fix pinning of uninstalled packages
    
    The previously used method for pinning uninstalled packages was:
    
    | Package: mypackage
    | Pin: version 0.no.version
    | Pin-Priority: 1000
    
    This works with current libapt (it actually prevents mypackage from
    being installed), but is due to an undocumented, and probably broken,
    behavior (see apt_preferences(5) for further details).
    A more correct way to obtain the result is:
    
    | Package: mypackage
    | Pin: version *
    | Pin-Priority: -1

diff --git a/debian/changelog b/debian/changelog
index f6480b1..ff0fa9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt-listbugs (0.1.3) UNRELEASED; urgency=low
+
+  * fixed logic: apt-listbugs now uses a more correct way to pin uninstalled
+  packages (thanks to Eugene V. Lyubimkin for making me realize that the
+  previously used method was not really correct)
+
+ -- Francesco Poli (t1000) <frx at firenze.linux.it>  Sun, 10 Jan 2010 22:14:34 +0100
+
 apt-listbugs (0.1.2) unstable; urgency=low
 
   [ Ryan Niebur ]
diff --git a/debian/copyright b/debian/copyright
index 9a8ae14..72ef704 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ The original source can always be found at:
 Copyright (C) 2002-2004  Masato Taruishi <taru at debian.org>
 Copyright (C) 2006-2008  Junichi Uekawa <dancer at debian.org>
 Copyright (C) 2007       Jean Lepropre <jlepropre at gmail.com>
-Copyright (C) 2008-2009  Francesco Poli <frx at firenze.linux.it>
+Copyright (C) 2008-2010  Francesco Poli <frx at firenze.linux.it>
 Copyright (C) 2009       Ryan Niebur <ryan at debian.org>
 
   This program is free software; you can redistribute it and/or modify
diff --git a/lib/apt-listbugs/logic.rb b/lib/apt-listbugs/logic.rb
index ba6738d..eb09dcd 100644
--- a/lib/apt-listbugs/logic.rb
+++ b/lib/apt-listbugs/logic.rb
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2002  Masato Taruishi <taru at debian.org>
 # Copyright (C) 2006-2008  Junichi Uekawa <dancer at debian.org>
-# Copyright (C) 2008-2009  Francesco Poli <frx at firenze.linux.it>
+# Copyright (C) 2008-2010  Francesco Poli <frx at firenze.linux.it>
 # Copyright (C) 2009  Ryan Niebur <ryan at debian.org>
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -469,8 +469,12 @@ class Viewer
       holdstr = ""
       pkgs.each { |pkg|
         pin_ver = "0.no.version"
+        pin_pri = @config.pin_priority
         if cur_pkgs[pkg] != nil
 	  pin_ver = cur_pkgs[pkg]['version']
+        else
+          pin_ver = "*"
+          pin_pri = "-1"
 	end
 	holdstr << "
 Explanation: Pinned by apt-listbugs at #{Time.now}"
@@ -481,7 +485,7 @@ Explanation:   ##{bug.bug_number}: #{bug.desc}"
 	holdstr << "
 Package: #{pkg}
 Pin: version #{pin_ver}
-Pin-Priority: #{@config.pin_priority}
+Pin-Priority: #{pin_pri}
 "
       }
       $stderr.puts holdstr if $DEBUG

-- 
apt-listbugs development tree