[Apt-listbugs-commits] [SCM] apt-listbugs development tree branch, master, updated. debian/0.1.4-6-g4c98389

[Francesco Poli (wintermute)]

The following commit has been merged in the master branch:
commit 641bc99280237bd4d27bbeb52c264e5ba75474e9
Author: Francesco Poli (wintermute) <invernomuto at paranoici.org>
Date:   Sun Jun 19 18:56:40 2011 +0200

    remove unused code

diff --git a/apt-listbugs b/apt-listbugs
index 399a7fb..837e294 100755
--- a/apt-listbugs
+++ b/apt-listbugs
@@ -373,7 +373,7 @@ end
 
 exit 0 if new_pkgs.size == 0
 
-Factory::PackageFactory.delete_ignore_pkgs(new_pkgs) if config.command == "apt"
+Factory::BugsFactory.delete_ignore_pkgs(new_pkgs) if config.command == "apt"
 # exitting if no new packages is found
 exit 0 if new_pkgs.size == 0
 
diff --git a/lib/apt-listbugs/logic.rb b/lib/apt-listbugs/logic.rb
index c86b43a..69ccf65 100644
--- a/lib/apt-listbugs/logic.rb
+++ b/lib/apt-listbugs/logic.rb
@@ -729,120 +729,15 @@ module Factory
   module_function :config, :config=, :create, :done?
   public :create
 
-  module PackageFactory
+  module BugsFactory
     extend Factory
 
-    # parse 'apt-listbugs list pkgname/version .... ' combination.
-    module ListFactory
-      include Factory
-      def field(pkgname)
-	f = {}
-        case pkgname
-        when /^(.*)\/(.*)$/
-          f["package"] = $1
-          f["version"] = $2
-        else
-          f["package"] = pkgname
-        end
-	f
-      end
-      module_function :field
-    end
-
-    module AptFactory
-      include Factory
-      DPKG = "/usr/bin/dpkg"
-      def field(pkgpath)
-        return Debian::Dpkg.field(pkgpath)
-      end
-      module_function :field
-    end
-
-    def create(pkgnames, *args)
-      # obtain package names and get information about them
-      step = 100.0 / pkgnames.size.to_f
-      pkgs = {}
-      reading = _("Reading package fields...")
-      pkgnames.each_index { |index|
-	if block_given?
-	  yield reading, (index * step).to_i.to_s + "%"
-	end
-	pkgnames[index].chomp!
-	f = nil
-	case config.command
-	when "apt"
-	  f = AptFactory.field(pkgnames[index])
-	when "list"
-	  f = ListFactory.field(pkgnames[index])
-	when "rss"
-	  f = ListFactory.field(pkgnames[index])
-	else
-	  raise _("Not Implemented")
-	end
-	pkgs[f["package"]] = f
-      }
-      if block_given?
-	yield reading, _("Done")
-      end
-      pkgs
-    end
-
     def delete_ignore_pkgs(new_pkgs)
       new_pkgs.delete_if { |name, pkg|
 	config.system_ignore_bugs.include?(name)
       }
     end
 
-    module_function :create, :delete_ignore_pkgs
-
-  end
-
-  module StatusFactory
-    extend Factory
-
-    def create(pkgs, *args)
-      # creating status database, which contains the list of packages.
-
-      if block_given?
-	yield _("Reading package status..."), "0%"
-      end
-      pkgres = []
-      pkgs.each_key { |pkg|
-        pkgres << "#{pkg}"
-      }
-      i=0
-      max=pkgres.size
-      step=(pkgres.size/100)*10+1
-      status = Debian::Packages.new(Debian::Dpkg::STATUS_FILE, pkgres) do
-	yield _("Reading package status..."),
-          "#{(i.to_f/max.to_f*100).to_i}%" if (i % step) == 0
-	i += 1
-      end
-      if block_given?
-	yield _("Reading package status..."), _("Done")
-      end
-      status
-    end
-
-    def delete_downgraded(cur_pkgs, new_pkgs)
-      new_pkgs.delete_if { |name, pkg|
-	val = false
-	ver = pkg["version"]
-	cur_ver = cur_pkgs[name]["version"] if cur_pkgs[name] != nil
-	if ver != nil && cur_ver != nil
-	  val = true if Debian::Dpkg.compare_versions(ver, "lt", cur_ver)
-	end
-	val
-      }
-    end
-
-    module_function :create, :delete_downgraded
-
-  end
-
-  module BugsFactory
-    extend Factory
-
     def create(new_pkgs, *args, &progress)
       cur_pkgs = args[0]
       bugs = Debian::Bugs.new
@@ -1120,7 +1015,7 @@ module Factory
       }
     end
 
-    module_function :create, :delete_ignore_bugs,
+    module_function :delete_ignore_pkgs, :create, :delete_ignore_bugs,
     :delete_uninteresting_bugs,
     :delete_regexp_bugs,
     :bug_is_irrelevant,
@@ -1129,6 +1024,7 @@ module Factory
     :find_max_version_below_ver,
     :find_min_version_above_ver,
     :iterate_fixed_found_version
+
   end
 
 end

-- 
apt-listbugs development tree