[Apt-listbugs-commits] [SCM] apt-listbugs development tree branch, master, updated. apt-listbugs/0.1.5-25-g6d98afc

[Francesco Poli (wintermute)]

The following commit has been merged in the master branch:
commit 21d1be0960715e785a539f01fe09493412437091
Author: Francesco Poli (wintermute) <invernomuto at paranoici.org>
Date:   Thu Dec 22 00:15:41 2011 +0100

    enhance readability of BugsFactory methods
    
    The space_delimited_bts_version parameter is better named bts_versions.
    Some comments were also made (hopefully) clearer.

diff --git a/lib/apt-listbugs/logic.rb b/lib/apt-listbugs/logic.rb
index 09879b2..b6b1187 100644
--- a/lib/apt-listbugs/logic.rb
+++ b/lib/apt-listbugs/logic.rb
@@ -811,12 +811,12 @@ module Factory
       bugs.delete_if { |bug| !config.fbugs.include?(bug.bug_number)}
     end
 
-    def iterate_fixed_found_version(space_delimited_bts_version, pkg_name)
+    def iterate_fixed_found_version(bts_versions, pkg_name)
       # iterate relevant versions, used to parsing Fixed and Found tags of BTS
-      if space_delimited_bts_version.nil?
+      if bts_versions.nil?
         return;
       end
-      space_delimited_bts_version.split(" ").each { |version|
+      bts_versions.split(" ").each { |version|
         # check each fixed_version
         case version
         when /^(.*)\/(.*)$/
@@ -833,13 +833,13 @@ module Factory
       }
     end
 
-    def find_max_version_below_ver(space_delimited_bts_version, new_ver, pkg_name)
+    def find_max_version_below_ver(bts_versions, new_ver, pkg_name)
       # find the max version from found/fixed that is below or equal to new_ver
-      # data format of space_delimited_bts_version:
-      # space-delimited PACKAGE/VERSION, or VERSION.
+      # data format of bts_versions:
+      # space-delimited sequence of PACKAGE/VERSION or VERSION items.
 
       maxver=nil
-      iterate_fixed_found_version(space_delimited_bts_version, pkg_name) { |each_ver|
+      iterate_fixed_found_version(bts_versions, pkg_name) { |each_ver|
         # check each fixed_ver
         if Debian::Dpkg.compare_versions(each_ver, "le", new_ver) &&
             ( maxver == nil || Debian::Dpkg.compare_versions(maxver, "le", each_ver) )
@@ -849,13 +849,13 @@ module Factory
       maxver
     end
 
-    def find_min_version_above_ver(space_delimited_bts_version, new_ver, pkg_name)
+    def find_min_version_above_ver(bts_versions, new_ver, pkg_name)
       # find the min version from found/fixed that is strictly above new_ver
-      # data format of space_delimited_bts_version:
-      # space-delimited PACKAGE/VERSION, or VERSION.
+      # data format of bts_versions:
+      # space-delimited sequence of PACKAGE/VERSION or VERSION items.
 
       minver=nil
-      iterate_fixed_found_version(space_delimited_bts_version, pkg_name) { |each_ver|
+      iterate_fixed_found_version(bts_versions, pkg_name) { |each_ver|
         # check each each_ver
         if Debian::Dpkg.compare_versions(each_ver, "gt", new_ver) &&
             ( minver == nil || Debian::Dpkg.compare_versions(minver, "ge", each_ver) )

-- 
apt-listbugs development tree