[Apt-listbugs-commits] [SCM] apt-listbugs development tree branch, master, updated. apt-listbugs/0.1.9-6-g8fa70a0
Francesco Poli (wintermute)
invernomuto at paranoici.org
Mon Jul 1 21:04:00 UTC 2013
The following commit has been merged in the master branch:
commit 35e5fe8491ed450d8131d106db89430c6cc36860
Author: Francesco Poli (wintermute) <invernomuto at paranoici.org>
Date: Sun Jun 30 21:43:32 2013 +0200
clarify online help and pending-state categories
The default list of pending-state categories to be shown needed an
additional item ("fixed"); it has also been reordered.
Various online help messages have been enhanced and clarified.
diff --git a/apt-listbugs b/apt-listbugs
index ce13fe3..4f9c789 100755
--- a/apt-listbugs
+++ b/apt-listbugs
@@ -4,7 +4,7 @@
#
# Copyright (C) 2002 Masato Taruishi <taru at debian.org>
# Copyright (C) 2006-2008 Junichi Uekawa <dancer at debian.org>
-# Copyright (C) 2008-2012 Francesco Poli <invernomuto at paranoici.org>
+# Copyright (C) 2008-2013 Francesco Poli <invernomuto at paranoici.org>
# Copyright (C) 2009 Ryan Niebur <ryan at debian.org>
# Copyright (C) 2012 Justin B Rye <jbr at edlug.org.uk>
#
@@ -75,7 +75,7 @@ apt-listbugs [-h] [-v] [-s <severities>] [-T <tags>] [-S <states>] [-B <bug#>] [
Filter (and sort) bugs by pending-state, showing only the bugs
matching specified values. List the pending-state categories that
you want to see, separated by commas and in the desired order.
- Default: [forwarded,done,pending,pending-fixed]. Possible values are:
+ Default: [pending,forwarded,pending-fixed,fixed,done]. Possible values are:
pending = open bug
forwarded = marked as "forwarded"
diff --git a/debian/changelog b/debian/changelog
index e5ce5f4..2416138 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ apt-listbugs (0.1.10) UNRELEASED; urgency=low
* bumped Standards-Version to 3.9.4: no changes needed
* updated VCS-* fields to canonical URIs
+ * clarified various online help messages and changed the default list of
+ pending-state categories to be shown:
+ [pending,forwarded,pending-fixed,fixed,done]
-- Francesco Poli (wintermute) <invernomuto at paranoici.org> Sat, 29 Jun 2013 17:18:26 +0200
diff --git a/debian/copyright b/debian/copyright
index 0248d24..217a773 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ The original source can always be found at:
Copyright (C) 2002-2004 Masato Taruishi <taru at debian.org>
Copyright (C) 2006-2008 Junichi Uekawa <dancer at debian.org>
Copyright (C) 2007 Jean Lepropre <jlepropre at gmail.com>
-Copyright (C) 2008-2012 Francesco Poli <invernomuto at paranoici.org>
+Copyright (C) 2008-2013 Francesco Poli <invernomuto at paranoici.org>
Copyright (C) 2009-2010 Ryan Niebur <ryan at debian.org>
Copyright (C) 2012 Justin B Rye <jbr at edlug.org.uk>
diff --git a/lib/apt-listbugs/logic.rb b/lib/apt-listbugs/logic.rb
index 64a223d..91b6efa 100644
--- a/lib/apt-listbugs/logic.rb
+++ b/lib/apt-listbugs/logic.rb
@@ -2,7 +2,7 @@
#
# Copyright (C) 2002 Masato Taruishi <taru at debian.org>
# Copyright (C) 2006-2008 Junichi Uekawa <dancer at debian.org>
-# Copyright (C) 2008-2012 Francesco Poli <invernomuto at paranoici.org>
+# Copyright (C) 2008-2013 Francesco Poli <invernomuto at paranoici.org>
# Copyright (C) 2009-2010 Ryan Niebur <ryan at debian.org>
#
# This program is free software; you can redistribute it and/or modify
@@ -43,17 +43,17 @@ class AppConfig
_("Options:\n"),
_(" -h : Display this help and exit.\n"),
_(" -v : Show version number and exit.\n"),
- sprintf(_(" -s <severities> : Severities you want to see [%s], or [all].\n"), @severity.join(',')),
- _(" -T <tags> : Tags you want to see.\n"),
- sprintf(_(" -S <stats> : Stats you want to see [%s].\n"), @stats.join(',')),
- _(" -B <bug#> : Restrict reporting to specified bug#s only.\n"),
+ sprintf(_(" -s <severities> : Filter bugs by severities you want to see (or \"all\")\n [%s].\n"), @severity.join(',')),
+ _(" -T <tags> : Filter bugs by tags you want to see.\n"),
+ sprintf(_(" -S <states> : Filter bugs by pending-state categories you want to see\n [%s].\n"), @stats.join(',')),
+ _(" -B <bug#> : Filter bugs by number, showing only the specified bugs.\n"),
_(" -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(_(" -P <priority> : Specifies Pin-Priority value [%s].\n"), @pin_priority),
- _(" -E <title> : Specifies the title of RSS output.\n"),
+ sprintf(_(" -P <priority> : Pin-Priority value [%s].\n"), @pin_priority),
+ _(" -E <title> : Title of RSS output.\n"),
_(" -q : Don't display progress bar.\n"),
- _(" -C <apt.conf> : Specify apt.conf.\n"),
+ _(" -C <apt.conf> : apt.conf file to use.\n"),
_(" -y : Assume that you select yes for all questions.\n"),
_(" -n : Assume that you select no for all questions.\n"),
_(" -d : Debug.\n"),
@@ -67,11 +67,13 @@ class AppConfig
def initialize
@severity = ["critical", "grave", "serious"]
@tag = nil
- @stats = ["forwarded", "done", "pending", "pending-fixed", ""]
- @statmap = [["forwarded", _("forwarded")],
- ["done", _("marked as done in some version")],
- ["pending", _("unfixed")],
- ["pending-fixed", _("tagged as pending a fix")]]
+ @stats = ["pending", "forwarded", "pending-fixed", "fixed", "done"]
+ @statmap = [["pending", _("Outstanding")],
+ ["forwarded", _("Forwarded")],
+ ["pending-fixed", _("Pending Upload")],
+ ["fixed", _("Fixed in NMU")],
+ ["absent", _("From other Branch")],
+ ["done", _("Resolved in some Version")]]
@fbugs = nil
@show_downgrade = false
@hostname = "bugs.debian.org"
@@ -465,8 +467,8 @@ class Viewer
else
if hold_pkgs.empty?
@config.frontend.puts "" +
- _(" y - continue the apt installation, but do not mark the bugs as ignored.\n") +
- _(" a - continue the apt installation and mark all the above bugs as ignored.\n")
+ _(" y - continue the apt installation, but do not mark the bugs\n as ignored.\n") +
+ _(" a - continue the apt installation and mark all the above bugs\n as ignored.\n")
end
@config.frontend.puts "" +
_(" n - stop the apt installation.\n") +
--
apt-listbugs development tree
More information about the Apt-listbugs-commits
mailing list