[Apt-listbugs-commits] [SCM] apt-listbugs development tree branch, master, updated. 0.1.0-20-g2b90030
Ryan Niebur
ryanryan52 at gmail.com
Sun Oct 18 18:13:52 UTC 2009
The following commit has been merged in the master branch:
commit 2b900305d67a91cb6bf08eedacef2eb35020657d
Merge: 667cc58858c6bfd01a6858ac3462aae15c230625 202a8cb2bdf65a02d3ed9bb232e0e012355cf5a6
Author: Ryan Niebur <ryanryan52 at gmail.com>
Date: Sun Oct 18 11:13:34 2009 -0700
Merge branch 'frx'
diff --combined lib/apt-listbugs/logic.rb
index ead7a66,89f0265..d50c17c
--- a/lib/apt-listbugs/logic.rb
+++ b/lib/apt-listbugs/logic.rb
@@@ -49,9 -49,8 +49,8 @@@ class AppConfi
_(" -D : Show downgraded packages, too.\n"),
sprintf(_(" -H <hostname> : Hostname of Debian Bug Tracking System [%s].\n"), @hostname),
sprintf(_(" -p <port> : Port number of the server [%s]\n"), @port),
- sprintf(_(" --pin-priority : Specifies Pin-Priority value [%s]\n"), @pin_priority),
- _(" --title : Specifies the title of rss output.\n"),
- _(" -f : Retrieve bug reports from BTS forcibly.\n"),
+ sprintf(_(" -P <priority> : Specifies Pin-Priority value [%s]\n"), @pin_priority),
+ _(" -E <title> : Specifies the title of rss output.\n"),
_(" -q : Don't display progress bar.\n"),
_(" -C <apt.conf> : Specify apt.conf.\n"),
_(" -y : Assume that you select yes for all questions.\n"),
@@@ -334,7 -333,7 +333,7 @@@ class Viewe
if hold_pkgs.empty?
ask_str << " [Y/n/?/...] "
else
- ask_str << "[N/?/...] "
+ ask_str << " [N/?/...] "
end
else
ask_str << " [Y/n] "
@@@ -356,6 -355,8 +355,8 @@@
end
case answer
when "y"
+ return true
+ when "a"
if hold_pkgs.empty?
bugs.each { |bug|
if ! @config.system_ignore_bugs.include?(bug.bug_number)
@@@ -365,7 -366,7 +366,7 @@@
}
return true
end
- when "n"
+ when "n"
return false
when /^#?(\d+)$/
if @config.querybts != nil
@@@ -437,7 -438,9 +438,9 @@@
end
else
if hold_pkgs.empty?
- @config.frontend.puts _(" y - continue the apt installation.\n")
+ @config.frontend.puts "" +
+ _(" y - continue the apt installation, but do not make the bugs ignored.\n") +
+ _(" a - continue the apt installation and make all the above bugs ignored.\n")
end
@config.frontend.puts "" +
_(" n - stop the apt installation.\n") +
@@@ -445,11 -448,11 +448,11 @@@
_(" #<num> - same as <num>\n") +
_(" r - redisplay bug lists.\n") +
_(" p <pkg..> - make pkgs pinned: need to restart apt to enable.\n") +
- _(" p - make all the above pkgs pinned. need to restart.\n") +
- _(" i <num> - make bug_number <num> ignored.\n") +
+ _(" p - make all the above pkgs pinned: need to restart.\n") +
+ _(" i <num> - make bug number <num> ignored.\n") +
_(" ? - print this help.\n")
if @config.browser != nil
- @config.frontend.puts sprintf(_(" w - display bug lists in html (uses %s).\n"), File.basename(@config.browser))
+ @config.frontend.puts sprintf(_(" w - display bug lists in HTML (uses %s).\n"), File.basename(@config.browser))
end
end
end
@@@ -682,10 -685,11 +685,10 @@@ en
module Factory
CONCURRENCY_LEVEL = 3
def done?(done)
- Done == done
+ _("Done") == done
end
def config
@@@ -769,7 -773,7 +772,7 @@@
pkgs[f["package"]] = f
}
if block_given?
- yield reading, Done
+ yield reading, _("Done")
end
pkgs
end
@@@ -787,11 -791,13 +790,11 @@@
module StatusFactory
extend Factory
- ReadStatusMsg = _("Reading package status...")
-
def create(pkgs, *args)
# creating status database, which contains the list of packages.
if block_given?
- yield ReadStatusMsg, "0%"
+ yield _("Reading package status..."), "0%"
end
pkgres = []
pkgs.each_key { |pkg|
@@@ -801,12 -807,12 +804,12 @@@
max=pkgres.size
step=(pkgres.size/100)*10+1
status = Debian::Packages.new(Debian::Dpkg::STATUS_FILE, pkgres) do
- yield ReadStatusMsg,
+ yield _("Reading package status..."),
"#{(i.to_f/max.to_f*100).to_i}%" if (i % step) == 0
i += 1
end
if block_given?
- yield ReadStatusMsg, Done
+ yield _("Reading package status..."), _("Done")
end
status
end
@@@ -830,6 -836,8 +833,6 @@@
module BugsFactory
extend Factory
- RetrvBTSMsg = _("Retrieving bug reports...")
-
def create(new_pkgs, *args, &progress)
cur_pkgs = args[0]
bugs = Debian::Bugs.new
@@@ -839,7 -847,7 +842,7 @@@
size = new_pkgs.size
mutex = Mutex.new
threads = []
- yield RetrvBTSMsg, "0%"
+ yield _("Retrieving bug reports..."), "0%"
begin
# obtain a list of package names
tmppkgs = []
@@@ -847,7 -855,7 +850,7 @@@
# send the list of package names and severity to be parsed.
bugs = config.parser.parse(tmppkgs, config.severity) { |pct|
- yield RetrvBTSMsg, pct
+ yield _("Retrieving bug reports..."), pct
}
rescue SOAP::HTTPStreamError => exception
config.frontend.puts _(" Fail")
@@@ -880,10 -888,10 +883,10 @@@
raise _("Exiting with error") if config.frontend.yes_or_no?(_("Abort the installation"))
bugs = []
end
- yield RetrvBTSMsg, "100%"
+ yield _("Retrieving bug reports..."), "100%"
if block_given?
- yield RetrvBTSMsg, Done
+ yield _("Retrieving bug reports..."), _("Done")
end
bugs
end
@@@ -1056,13 -1064,15 +1059,13 @@@
val
end
- BugFixedParseMsg = _("Parsing Found/Fixed information...")
-
def delete_irrelevant_bugs (bugs, cur_pkgs, new_pkgs)
# Ignore bugs that do not apply to the installing version.
max=bugs.size
step=(max/100)*10+1
i=0
- yield BugFixedParseMsg, "0%"
+ yield _("Parsing Found/Fixed information..."), "0%"
bugs.delete_if { |bug|
val = false
@@@ -1073,7 -1083,7 +1076,7 @@@
cur_ver = cur_pkgs[name]["version"] if cur_pkgs[name] != nil
# show progress
- yield BugFixedParseMsg,
+ yield _("Parsing Found/Fixed information..."),
"#{(i.to_f/max.to_f*100).to_i}%" if (i % step) == 0
i += 1
@@@ -1081,8 -1091,8 +1084,8 @@@
bug.bug_number, bug.fixed, bug.found, bug.stat)
val
}
- yield BugFixedParseMsg, "100%"
- yield BugFixedParseMsg, Done
+ yield _("Parsing Found/Fixed information..."), "100%"
+ yield _("Parsing Found/Fixed information..."), _("Done")
bugs
end
--
apt-listbugs development tree
More information about the Apt-listbugs-commits
mailing list