[Apt-listbugs-commits] [SCM] apt-listbugs development tree branch, master, updated. apt-listbugs/0.1.9-8-g42862ed

Sun Jul 7 21:22:14 UTC 2013

The following commit has been merged in the master branch:
commit 969623873c4072e958a2765baf1dd707dd5fe367
Author: Francesco Poli (wintermute) <invernomuto at paranoici.org>
Date:   Sun Jul 7 22:02:14 2013 +0200

    code cleanup: drop redundant trailing spaces

diff --git a/Makefile b/Makefile
index adde211..1f9b1fd 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ all: apt-listbugs.1 $(MOFILES)
 
 .PHONY: clean
 clean:
-	find -name '*~' | xargs rm -f -- 
+	find -name '*~' | xargs rm -f --
 	rm -f tests/log/tmp
 	rm -f apt-listbugs.1
 	rm -f $(MOFILES)
diff --git a/apt-listbugs b/apt-listbugs
index 4f9c789..d2381fe 100755
--- a/apt-listbugs
+++ b/apt-listbugs
@@ -39,7 +39,7 @@ apt-listbugs [options] <command> [arguments]
 apt-listbugs is a tool which retrieves bug reports from the Debian
 Bug Tracking System and lists them. In particular, it is intended to
 be invoked before each upgrade by apt, or other similar package managers,
-in order to check whether the upgrade/installation is safe. 
+in order to check whether the upgrade/installation is safe.
 
 == USAGE
 
@@ -118,14 +118,14 @@ apt-listbugs [-h] [-v] [-s <severities>] [-T <tags>] [-S <states>] [-B <bug#>] [
 
 * -q, --quiet
 
-  Don't display progress bar. This option is assumed if stdout is not a 
+  Don't display progress bar. This option is assumed if stdout is not a
   terminal or if /dev/tty cannot be opened.
 
 * -C <apt.conf>, --aptconf <apt.conf>
 
   Specifies the apt configuration file to use.
 
-* -y, --force-yes 
+* -y, --force-yes
 
   Assumes that you select yes for all questions.
 
@@ -174,7 +174,7 @@ apt-listbugs [-h] [-v] [-s <severities>] [-T <tags>] [-S <states>] [-B <bug#>] [
 == CONFIGURATION FILE
 
 apt-listbugs understands APT configuration file (see apt.conf). The
-notable configuration options are 
+notable configuration options are
 
 : Acquire::HTTP::Proxy
 
@@ -215,7 +215,7 @@ notable configuration options are
 
 == EXIT CODE
 
-: 0 
+: 0
 
   Success.
 
@@ -223,11 +223,11 @@ notable configuration options are
 
   When something is wrong.
 
-: 10 
+: 10
 
   To warn APT not to proceed.
 
-: 130 
+: 130
 
   When a SIGINT was received (for instance because the user
   pressed [Ctrl+C]).
@@ -289,7 +289,7 @@ end
 ## main from here
 
 # Drop out as early as possible if this env var is set.
-if ENV["APT_LISTBUGS_FRONTEND"] == "none" 
+if ENV["APT_LISTBUGS_FRONTEND"] == "none"
   exit 0
 end
 # handle options
@@ -326,7 +326,7 @@ when "apt"
         puts "#{pkg}" if $DEBUG
         state=3
       when /^quiet=(.*)/
-        if $1.to_i > 0 
+        if $1.to_i > 0
           puts "#{pkg}" if $DEBUG
           config.quiet=true
         end
@@ -350,8 +350,8 @@ when "apt"
           # into the system by this package
         when ">", "<"
           # ">" means downgrade, "<" means upgrade
-          if ( config.show_downgrade or direction == "<" ) 
-            if ( pkgname != nil and new_ver != "-" ) 
+          if ( config.show_downgrade or direction == "<" )
+            if ( pkgname != nil and new_ver != "-" )
               f = {}
               f["package"] = pkgname
               f["version"] = new_ver
diff --git a/aptcleanup b/aptcleanup
index 41675f2..3a25f94 100755
--- a/aptcleanup
+++ b/aptcleanup
@@ -22,7 +22,7 @@
 #  if not, write to the Free Software Foundation, Inc., 51 Franklin St,
 #  Fifth Floor, Boston, MA 02110-1301, USA.
 #
-# 
+#
 
 if File.expand_path(__FILE__).match(/^\/usr\/share\/apt-listbugs\//)
   $LOAD_PATH.unshift("/usr/share/apt-listbugs")
diff --git a/debian/README.Debian b/debian/README.Debian
index f6a5b34..6c34e77 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -177,7 +177,7 @@ possible scenarios:
  0) the bug is actually present in B/b1, but causes breakage in
     package A; hence, do not upgrade to B/b1 if you want to avoid
     breaking package A
- 
+
  1) the bug is actually present in B/b1, but only shows up when a
     given version (say, a1) of package A is installed; hence, do not
     upgrade to A/a1 if you want to prevent the bug in package B from
diff --git a/debian/changelog b/debian/changelog
index b629313..fd37b1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -279,7 +279,7 @@ apt-listbugs (0.0.95) unstable; urgency=low
   [ Junichi Uekawa ]
   * ja.po: update
   * *.po: regenerated.
-  * strings are now frozen in gettext, work around it. 
+  * strings are now frozen in gettext, work around it.
     (closes: #515883, #517058)
 
  -- Junichi Uekawa <dancer at debian.org>  Wed, 25 Feb 2009 21:59:37 +0900
@@ -427,13 +427,13 @@ apt-listbugs (0.0.79) unstable; urgency=low
   * "Add a option to list all severities", by request from martin f krafft
     (Closes: #294583).
   * Now possible to obtain the list of bug reports a maintainer may want
-    to close in his changelog by: 
+    to close in his changelog by:
     apt-listbugs list PACKAGE/VERSION | grep '^ #'
-  
+
   * apt-listbugs no longer uses cache, obsolete --force-download option.
     obsolete --timer
     obsolete --cache-dir
-  
+
  -- Junichi Uekawa <dancer at debian.org>  Mon, 25 Jun 2007 21:23:02 +0900
 
 apt-listbugs (0.0.78) unstable; urgency=low
@@ -474,10 +474,10 @@ apt-listbugs (0.0.74) unstable; urgency=low
   * 'debian/rules update-po' now shows a summary of undone translations.
   * support '--quiet' apt option. (closes: #330621)
   - use 'VERSION 2'
-  - modify 10apt-listbugs Pre-Install-Pkgs to be simpler and set 
+  - modify 10apt-listbugs Pre-Install-Pkgs to be simpler and set
     DPkg::Tools::Options::/usr/sbin/apt-listbugs::Version "2";
   - README.Debian: debugging method for  'apt-listbugs apt' has changed.
-  
+
  -- Junichi Uekawa <dancer at debian.org>  Wed, 11 Apr 2007 22:19:26 +0900
 
 apt-listbugs (0.0.73) unstable; urgency=low
@@ -673,7 +673,7 @@ apt-listbugs (0.0.56) unstable; urgency=low
     disabled CGI access. (closes: #344397) we already have access to
     Fixed_Version information through SOAP interface, we don't need CGI
     access anymore.
-  * Use Fixed_Version information to find relevant bugs. 
+  * Use Fixed_Version information to find relevant bugs.
     (closes: #323626, #334697, #342513, #370400)
   - show progress when parsing fixed version info.
   - TODO: bugs need to be checked against source, not binary package,
@@ -683,7 +683,7 @@ apt-listbugs (0.0.56) unstable; urgency=low
   * Bug fix: "should check whether connected to terminal, fall back to
     other output", thanks to martin f krafft (Closes: #383752).
     Will assume '-n' if stdout is not a terminal.
-  * fix manpage, remove reference to ~dancer/apt-listbugs, it's now 
+  * fix manpage, remove reference to ~dancer/apt-listbugs, it's now
     /indices/ on bugs.debian.org.
   * make apt-listbugs version useful, by embedding the real package
     version to apt-listbugs source instead of old stale CVS tag.
@@ -706,7 +706,7 @@ apt-listbugs (0.0.54) unstable; urgency=low
     http://merkel.debian.org
   * remove unsupported and unmaintained reference to release-critical
   * remove unsupported and unmaintained reference to LDIF
-  * update po files, please update translations. 
+  * update po files, please update translations.
   * handle HTTP redirect in Debian::BTS::HTTP.
   * Depend on libhttp-access2-ruby1.8 for SOAP redirect
 
@@ -739,17 +739,17 @@ apt-listbugs (0.0.51) unstable; urgency=low
 
   * New maintainer. (closes: #374104)
   - README.Debian, copyright: update.
-  
+
   * Standards-Version: 3.7.2
   * Bug fix: "apt-listbugs: bad control file parsing; sends the long
-    description to dpkg --compare-versions", thanks to James Westby 
+    description to dpkg --compare-versions", thanks to James Westby
     (Closes: #362671).
   * Bug fix: "apt-listbugs: fails with not in gzip format errors", thanks
     to James Westby  (Closes: #245232).
 
     tested with
     echo ../apt-listbugs_0.0.50_all.deb |  /usr/sbin/apt-listbugs apt
-  
+
   * Remove absolute paths of programs from maintainer scripts.
     (Closes: #341148)
   * Bug fix: "[PATCH] grammar error in apt-listbugs", thanks to Thierry
@@ -791,7 +791,7 @@ apt-listbugs (0.0.49) unstable; urgency=low
   * Applied the patch provided by Adam Majer <adamm at zombino.com>
      - Doesn't use chomp! (closes: #289361).
   * Put -f option before -O in tar. tar seems to stop parsing
-    the flags after the first pathname. Thanks to 
+    the flags after the first pathname. Thanks to
     Torsten Hilbrich <torsten.hilbrich at gmx.net> (closes: #310179)
 
  -- Masato Taruishi <taru at debian.org>  Thu,  2 Jun 2005 12:21:13 +0900
@@ -835,7 +835,7 @@ apt-listbugs (0.0.45) unstable; urgency=low
   * Remove sudo call of security.rss. (closes: #281396)
   * Handle comment lines of preferences file correctly
      (closes: #274174)
-  * Don't overwrite preferences because of possibilities of 
+  * Don't overwrite preferences because of possibilities of
     its corruptness.
 
  -- Masato Taruishi <taru at valinux.co.jp>  Tue, 16 Nov 2004 20:50:27 +0900
@@ -846,7 +846,7 @@ apt-listbugs (0.0.44) unstable; urgency=low
     possible (closes: #270445, #274149).
   * Added security.rss generator (experimental).
     - Now you can track security issues of packages which you install
-      by any kind of RSS viewer. 
+      by any kind of RSS viewer.
     - Register /var/cache/apt-listbugs/security.rss to you viewer.
     - Note that it's experimental.
 
@@ -1255,7 +1255,7 @@ apt-listbugs (0.0.1hanzubon4) unstable; urgency=low
 apt-listbugs (0.0.1hanzubon3) unstable; urgency=low
 
   * Exit with error code 10 when a user wants to stop the installation.
-  * Delete same version as the current installed version for lesser 
+  * Delete same version as the current installed version for lesser
     threshold.
   * Exit immediately when no package will be installed.
 
diff --git a/debian/control b/debian/control
index b1cc7dc..48bab5c 100644
--- a/debian/control
+++ b/debian/control
@@ -14,13 +14,13 @@ Architecture: all
 Depends: ${misc:Depends}, ruby1.8 (>= 1.8), libruby1.8 (>= 1.8.5), ruby-debian (>= 0.3.3), apt, ruby-gettext (>= 2.1.0), ruby-xmlparser, ruby-httpclient (>= 2.1.5.2-1)
 Suggests: reportbug, debianutils (>= 2.0) | www-browser | w3m
 Description: tool which lists critical bugs before each apt installation
- apt-listbugs is a tool which retrieves bug reports from the Debian Bug 
- Tracking System and lists them. Especially, it is intended to be invoked 
- before each upgrade/installation by apt in order to check whether the 
- upgrade/installation is safe. 
+ apt-listbugs is a tool which retrieves bug reports from the Debian Bug
+ Tracking System and lists them. Especially, it is intended to be invoked
+ before each upgrade/installation by apt in order to check whether the
+ upgrade/installation is safe.
  .
- Many developers and users prefer the unstable version of Debian for its new 
- features and packages.  apt, the usual upgrade tool, can break your system by 
+ Many developers and users prefer the unstable version of Debian for its new
+ features and packages.  apt, the usual upgrade tool, can break your system by
  installing a buggy package.
  .
  apt-listbugs lists critical bug reports from the Debian Bug Tracking System.
diff --git a/debian/postrm b/debian/postrm
index c527c60..e4a1cea 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -27,7 +27,7 @@ case "$1" in
         rm -rf /var/lib/apt-listbugs/
         rm -f $hook.disabled
         ;;
-    
+
     remove)
         mv $hook $hook.disabled
         ;;
@@ -41,7 +41,7 @@ case "$1" in
 
     upgrade|failed-upgrade|abort-upgrade|disappear)
         ;;
-    
+
     *)
         echo "postrm called with unknown argument \`$1'" >&2
         exit 1
diff --git a/debian/preinst b/debian/preinst
index 54480ba..c74e38b 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -10,4 +10,4 @@ fi
 
 #DEBHELPER#
 
-exit 0 
+exit 0
diff --git a/examples/from-severity-get-bugtitles-and-pkgnames.rb b/examples/from-severity-get-bugtitles-and-pkgnames.rb
index 505356d..8ef6092 100755
--- a/examples/from-severity-get-bugtitles-and-pkgnames.rb
+++ b/examples/from-severity-get-bugtitles-and-pkgnames.rb
@@ -2,7 +2,7 @@
 
 ###
 ### test the relay with get_bugs->get_status.
-### 
+###
 
 require 'debian/bts'
 require 'debian/btssoap'
@@ -21,6 +21,6 @@ p reqbugs.length
 reqbugs.each do |bug|
   sa << bug
 end
-soap.get_status(sa).each do |f| 
+soap.get_status(sa).each do |f|
   p f
 end
diff --git a/examples/getbugstest.rb b/examples/getbugstest.rb
index 8319461..2c0cbea 100755
--- a/examples/getbugstest.rb
+++ b/examples/getbugstest.rb
@@ -2,7 +2,7 @@
 
 ###
 ### test the get_bugs interface, which returns the bugs matching the key-id pair from the BTS.
-### 
+###
 
 require 'debian/bts'
 require 'debian/btssoap'
diff --git a/examples/rc2rss b/examples/rc2rss
index ad56b44..9a56dca 100755
--- a/examples/rc2rss
+++ b/examples/rc2rss
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# script to create your rss. 
+# script to create your rss.
 #
 num=`dpkg --get-selections | grep install | grep -v deinstall | awk -F' ' '{print $1;}' | wc -l`
 dpkg --get-selections | grep install | grep -v deinstall | awk -F' ' '{print $1;}' | xargs -n $num /usr/sbin/apt-listbugs rss
diff --git a/lib/debian/bts.rb b/lib/debian/bts.rb
index 639a12d..ea7c201 100644
--- a/lib/debian/bts.rb
+++ b/lib/debian/bts.rb
@@ -57,7 +57,7 @@ module Debian
           # the total number of bugs
           max = reqbugs.length
           # progressed amount
-          offset_i = 0 
+          offset_i = 0
 
           # process each bug number and get contents, in batches of
           # ParseStep bugs
@@ -74,6 +74,6 @@ module Debian
           bugs
 	end
       end
-    end      
+    end
   end
 end
diff --git a/lib/debian/btssoap.rb b/lib/debian/btssoap.rb
index ad602bc..0b54cc3 100644
--- a/lib/debian/btssoap.rb
+++ b/lib/debian/btssoap.rb
@@ -21,7 +21,7 @@ require 'debian/bug'
 
 module Debian
   module BTSSOAP
-    class StringArray < Array; end 
+    class StringArray < Array; end
     class Soap
       def initialize(host = "bugs.debian.org", port = 80)
         @server="http://#{host}:#{port}/cgi-bin/soap.cgi"
@@ -35,7 +35,7 @@ module Debian
         @drv.options["protocol.http.connect_timeout"] = 999
         @drv.options["protocol.http.send_timeout"] = 999
         @drv.options["protocol.http.receive_timeout"] = 999
-        
+
         # define StringArray
         @map = SOAP::Mapping::Registry.new
         @map.set(StringArray, SOAP::SOAPArray,
@@ -61,10 +61,10 @@ module Debian
             # parse the received information, given from the server
             p res if $DEBUG
             res.package.split(/[ \t?,()]+/).each { |package|
-              newbug=Debian::Bug.new(package, 
-                                     bugnum.to_s, 
+              newbug=Debian::Bug.new(package,
+                                     bugnum.to_s,
                                      res.severity,
-                                     res.pending, 
+                                     res.pending,
                                      res.subject.gsub(/\r/,''),
                                      res.tags.split(" "),
                                      res.mergedwith.to_s.split(" "),
diff --git a/lib/debian/bug.rb b/lib/debian/bug.rb
index b701bb4..6699d01 100644
--- a/lib/debian/bug.rb
+++ b/lib/debian/bug.rb
@@ -40,26 +40,26 @@ module Debian
     def to_s
       "#" + @bug_number + ":" + @pkg_name + ":" + @desc
     end
-    
+
     def inspect
       @bug_number + " - " +
 	@pkg_name + " - " +
 	@severity + " - " +
 	@stat + " - " +
-	@tags.to_s + " - " + 
+	@tags.to_s + " - " +
 	@desc + " merged with: " + @mergeids.join(', ') +
-	@found.to_s + " - " + 
-	@fixed.to_s + " - " + 
+	@found.to_s + " - " +
+	@fixed.to_s + " - " +
 	@time.to_s
     end
 
     attr_accessor :pkg_name, :bug_number, :severity,
     :stat, :desc, :tags, :mergeids, :log, :time, :found, :fixed
-    
+
   end
-  
+
   class Bugs < Array
-    
+
     def each_by_category (pkg, sev, stat)
       each { |bug|
 	yield bug if bug.pkg_name == pkg &&
@@ -67,7 +67,7 @@ module Debian
 	  bug.stat == stat
       }
     end
-    
+
     def sub(type, val)
       sub = Bugs.new
       each { |bug|
diff --git a/lib/debian/mytempfile.rb b/lib/debian/mytempfile.rb
index 4e9cefa..753b477 100644
--- a/lib/debian/mytempfile.rb
+++ b/lib/debian/mytempfile.rb
@@ -27,7 +27,7 @@ class MyTempfile < DelegateClass(File)
 
     lock = nil
     n = failure = 0
-    
+
     begin
       Thread.critical = true
 
@@ -82,7 +82,7 @@ class MyTempfile < DelegateClass(File)
   def _close	# :nodoc:
     @tmpfile.close if @tmpfile
     @data[1] = @tmpfile = nil
-  end    
+  end
   protected :_close
 
   # Closes the file.  If the optional flag is true, unlinks the file
@@ -137,7 +137,7 @@ class MyTempfile < DelegateClass(File)
     def callback(data)	# :nodoc:
       pid = $$
       lambda{
-	if pid == $$ 
+	if pid == $$
 	  path, tmpfile, cleanlist = *data
 
 	  print "removing ", path, "..." if $DEBUG
diff --git a/tests/002_nobugs.sh b/tests/002_nobugs.sh
index 66a222b..51d837a 100755
--- a/tests/002_nobugs.sh
+++ b/tests/002_nobugs.sh
@@ -1,2 +1,2 @@
 (echo 'VERSION 2'; echo '' ;ls -1 /var/cache/apt/archives/eclipse-pde-nls_*.deb | sed 's/^/x x x x /') | \
- time ./apt-listbugs --debug apt -y 
+ time ./apt-listbugs --debug apt -y
diff --git a/tests/008_test_proxy.sh b/tests/008_test_proxy.sh
index 0b6c9d6..cbf77b7 100755
--- a/tests/008_test_proxy.sh
+++ b/tests/008_test_proxy.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-set -x 
-# assume that 
+set -x
+# assume that
 #   DIRECT connection to network is possible
 #   PROXY at 127.0.0.1:80 handles HTTP requests but does not proxy (apache default config)
 
diff --git a/tests/009_-H.sh b/tests/009_-H.sh
index e14776a..59e29b6 100755
--- a/tests/009_-H.sh
+++ b/tests/009_-H.sh
@@ -3,5 +3,5 @@
 
 grep-result "SOAP::HTTPStreamError" ./apt-listbugs list  apt-listbugs -H merkel.debian.org -p 80 -d -n
 grep-result "Errno::ECONNREFUSED" ./apt-listbugs list  apt-listbugs -H merkel.debian.org -p 81 -d -n
-grep-result-not "SOAP::HTTPStreamError" ./apt-listbugs list  apt-listbugs -H bugs.debian.org -p 80 -y -d 
+grep-result-not "SOAP::HTTPStreamError" ./apt-listbugs list  apt-listbugs -H bugs.debian.org -p 80 -y -d
 exit 0

-- 
apt-listbugs development tree

