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

[Ryan Niebur]

The following commit has been merged in the master branch:
commit c34d8105bcc780d4281695b49601b207f3373614
Author: Francesco Poli (t1000) <frx at firenze.linux.it>
Date:   Wed Oct 28 23:57:29 2009 +0100

    added robustness checks to aptcleanup
    
    aptcleanup should gracefully cope with packages which do not (or no longer)
    exist in configured repositories: the added checks avoid errors in such
    situations

diff --git a/aptcleanup b/aptcleanup
index b0c679b..f7d1218 100755
--- a/aptcleanup
+++ b/aptcleanup
@@ -53,8 +53,14 @@ p.pins.each do |pin|
     pinnedpkgs << pinned_package
 
     # which version would get installed, if the pinning were removed ?
-    unpinned_candidate_version = ""
-    unpinned_candidate_version = "/" + `env LC_ALL=C #{APTCACHE} -o Dir::Etc::Preferences=#{unpinned_preferences} policy #{pinned_package}`.split("\n").select{|x| x.match("Candidate:")}[0].split(" ")[1]
+    unpinned_candidate_version = nil
+    policy_cand_line = `env LC_ALL=C #{APTCACHE} -o Dir::Etc::Preferences=#{unpinned_preferences} policy #{pinned_package} 2> /dev/null`.split("\n").select{|x| x.match("Candidate:")}[0]
+    if policy_cand_line != nil
+      policy_cand_vers = policy_cand_line.split(" ")[1]
+      if policy_cand_vers != nil
+        unpinned_candidate_version = "/" + policy_cand_vers
+      end
+    end
     if unpinned_candidate_version == "/(none)" or unpinned_candidate_version == nil
       unpinned_candidate_version = ""
       $stderr.puts "Warning: no candidate version for #{pinned_package}" if $DEBUG
diff --git a/debian/changelog b/debian/changelog
index 99d202d..950751c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 apt-listbugs (0.1.2) UNRELEASED; urgency=low
 
+  [ Ryan Niebur ]
   * allow setting AptListbugs::IgnoreRegexp in apt.conf to ignore bugs
     with titles matching a regexp when in apt mode (Closes: #553346)
 
- -- Ryan Niebur <ryan at debian.org>  Sun, 01 Nov 2009 02:31:13 -0800
+  [ Francesco Poli (t1000) ]
+  * added robustness checks to aptcleanup to cope with obsolete packages
+
+ -- Francesco Poli (t1000) <frx at firenze.linux.it>  Sun, 01 Nov 2009 02:53:42 -0800
 
 apt-listbugs (0.1.1) unstable; urgency=low
 

-- 
apt-listbugs development tree