Hi!
The debian-installer team has prepared an update for Etch debconf. [1]
This update is needed to prevent issues when using the Lenny installer
to install Etch.
debconf-apt-progress is the sole target of this update. As far as we
know, debian-installer is currently its only user: it is necessary to
show the progress of package installations during the "pkgsel" installer
stage.
This update is quite important for Etch+1/2, as its installer is going
to be the Lenny version of d-i.
Attached, you will find the diff of the proposed upload against the
previous version found in Etch.
[1] http://lists.debian.org/debian-boot/2008/03/msg00060.html
Cheers,
--
Jérémy Bobbio .''`.
lunar@debian.org : :Ⓐ : # apt-get install anarchism
`. `'`
`-
diff -Nru debconf-1.5.11etch1/debconf-apt-progress debconf-1.5.11etch2/debconf-apt-progress
--- debconf-1.5.11etch1/debconf-apt-progress 2007-09-27 12:19:41.000000000 +0200
+++ debconf-1.5.11etch2/debconf-apt-progress 2008-03-13 10:42:16.000000000 +0100
@@ -73,6 +73,18 @@
Stop a running progress bar.
+=item B<--no-progress>
+
+Avoid starting, stopping, or stepping the progress bar. Progress
+messages from apt, media change events, and debconf questions will still
+be passed through to debconf.
+
+=item B<--dlwaypoint> I<percentage>
+
+Specify what percent of the progress bar to use for downloading packages.
+The remainder will be used for installing packages. The default is to use
+15% for downloading and the remaining 85% for installing.
+
=item B<--logfile> I<file>
Send the normal output from apt to the given file.
@@ -128,6 +140,8 @@
use Debconf::Client::ConfModule ();
my ($config, $start, $from, $to, $stop);
+my $progress=1;
+my $dlwaypoint=15;
my ($logfile, $logstderr);
sub checkopen (@) {
@@ -260,17 +274,14 @@
my ($from, $to, $line) = @_;
my ($status, $pkg, $percent, $description) = split ':', $line, 4;
- # Crude waypointing. 15% was chosen to match base-installer,
- # but could benefit from timing tests under various
- # bandwidth conditions.
my ($min, $len);
if ($status eq 'dlstatus') {
$min = 0;
- $len = 15;
+ $len = $dlwaypoint;
}
elsif ($status eq 'pmstatus') {
- $min = 15;
- $len = 85;
+ $min = $dlwaypoint;
+ $len = 100 - $dlwaypoint;
}
elsif ($status eq 'media-change') {
Debconf::Client::ConfModule::subst(
@@ -281,16 +292,16 @@
$ret[0] == 0 or die "Can't display media change request!\n";
Debconf::Client::ConfModule::go();
print COMMAND_WRITE "\n" || die "can't talk to command fd: $!";
- next;
+ return;
}
else {
- next;
+ return;
}
$percent = ($percent * $len / 100 + $min);
$percent = ($percent * ($to - $from) / 100 + $from);
$percent =~ s/\..*//;
- Debconf::Client::ConfModule::progress('SET', $percent);
+ Debconf::Client::ConfModule::progress('SET', $percent) if $progress;
Debconf::Client::ConfModule::subst(
'debconf-apt-progress/info', 'DESCRIPTION', $description);
Debconf::Client::ConfModule::progress(
@@ -321,7 +332,7 @@
use IO::Handle;
Debconf::Client::ConfModule::progress(
- 'INFO', 'debconf-apt-progress/preparing');
+ 'INFO', 'debconf-apt-progress/preparing') if $progress;
reservefds(4, 5, 6);
@@ -377,11 +388,13 @@
my $status_buf = '';
my $debconf_command_buf = '';
- while (not $status_eof or not $debconf_command_eof) {
+ # STATUS_READ should be the last fd to close. DEBCONF_COMMAND_WRITE
+ # may end up captured by buggy daemons, so terminate the loop even
+ # if we haven't hit $debconf_command_eof.
+ while (not $status_eof) {
my $rin = '';
my $rout;
- vec($rin, fileno(STATUS_READ), 1) = 1
- unless $status_eof;
+ vec($rin, fileno(STATUS_READ), 1) = 1;
vec($rin, fileno(DEBCONF_COMMAND_READ), 1) = 1
unless $debconf_command_eof;
my $sel = select($rout = $rin, undef, undef, undef);
@@ -458,7 +471,11 @@
my $status = $?;
# make sure that the progress bar always gets to the end
- Debconf::Client::ConfModule::progress('SET', $to);
+ Debconf::Client::ConfModule::progress('SET', $to) if $progress;
+
+ if ($status & 127) {
+ return 127;
+ }
return ($status >> 8);
}
@@ -466,13 +483,13 @@
sub start_bar ($$) {
my ($from, $to) = @_;
Debconf::Client::ConfModule::progress(
- 'START', $from, $to, 'debconf-apt-progress/title');
+ 'START', $from, $to, 'debconf-apt-progress/title') if $progress;
Debconf::Client::ConfModule::progress(
- 'INFO', 'debconf-apt-progress/preparing');
+ 'INFO', 'debconf-apt-progress/preparing') if $progress;
}
sub stop_bar () {
- Debconf::Client::ConfModule::progress('STOP');
+ Debconf::Client::ConfModule::progress('STOP') if $progress;
# If we don't stop, we leave a zombie in case some daemon fails to
# disconnect from fd 3.
Debconf::Client::ConfModule::stop();
@@ -492,13 +509,20 @@
my @saved_argv = @ARGV;
-my $result = GetOptions('config' => \$config,
- 'start' => \$start,
- 'from=i' => \$from,
- 'to=i' => \$to,
- 'stop' => \$stop,
- 'logfile=s' => \$logfile,
- 'logstderr' => \$logstderr);
+my $result = GetOptions('config' => \$config,
+ 'start' => \$start,
+ 'from=i' => \$from,
+ 'to=i' => \$to,
+ 'stop' => \$stop,
+ 'logfile=s' => \$logfile,
+ 'logstderr' => \$logstderr,
+ 'progress!' => \$progress,
+ 'dlwaypoint=i' => \$dlwaypoint,
+);
+
+if (! $progress && ($start || $from || $to || $stop)) {
+ die "--no-progress cannot be used with --start, --from, --to, or --stop\n";
+}
unless ($start) {
if (defined $from and not defined $to) {
diff -Nru /tmp/RQGGYEQVmR/debconf-1.5.11etch1/debian/changelog /tmp/IHF7zRVfpQ/debconf-1.5.11etch2/debian/changelog
--- debconf-1.5.11etch1/debian/changelog 2007-09-27 12:23:31.000000000 +0200
+++ debconf-1.5.11etch2/debian/changelog 2008-03-13 11:24:49.000000000 +0100
@@ -1,3 +1,18 @@
+debconf (1.5.11etch2) stable; urgency=low
+
+ * Backport changes to make debconf-apt-progress compatible with the Lenny
+ debian-installer:
+ - Add --no-progress option intended to be used by apt-install in d-i.
+ - Notice if the child exited abnormally, and exit nonzero.
+ - Add --dlwaypoint option (without the cancel changes).
+ - Fix tasksel hangs when $debconf_command_eof never became true
+ because of buggy daemons. STATUS_READ should be the last fd to close, so
+ checking $status_eof is sufficient. (LP: #141601)
+ - Fix use of 'next' rather than 'return' in debconf-apt-progress
+ handle_status.
+
+ -- Jérémy Bobbio <lunar@debian.org> Thu, 13 Mar 2008 11:24:39 +0100
+
debconf (1.5.11etch1) stable; urgency=low
[ Colin Watson ]
diff -Nru /tmp/RQGGYEQVmR/debconf-1.5.11etch1/doc/man/po4a/po/debconf.pot /tmp/IHF7zRVfpQ/debconf-1.5.11etch2/doc/man/po4a/po/debconf.pot
--- debconf-1.5.11etch1/doc/man/po4a/po/debconf.pot 2007-09-27 12:27:19.000000000 +0200
+++ debconf-1.5.11etch2/doc/man/po4a/po/debconf.pot 2008-03-13 11:45:20.000000000 +0100
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-09-27 12:27+0200\n"
+"POT-Creation-Date: 2008-03-13 10:45+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,7 +108,7 @@
msgstr ""
# type: =head1
-#: ../../debconf:47 ../../debconf-apt-progress:93 ../../debconf-copydb:74 ../../debconf-set-selections:59
+#: ../../debconf:47 ../../debconf-apt-progress:105 ../../debconf-copydb:74 ../../debconf-set-selections:59
msgid "EXAMPLES"
msgstr ""
@@ -156,7 +156,7 @@
msgstr ""
# type: textblock
-#: ../../debconf:111 ../../Debconf/Client/ConfModule.pm:160 ../../debconf-apt-progress:556 ../../debconf-communicate:75 ../../debconf-copydb:177 ../../debconf-getlang:257 ../../debconf-loadtemplate:49 ../../debconf-mergetemplate:182 ../../dpkg-preconfigure:237 ../../dpkg-reconfigure:262
+#: ../../debconf:111 ../../Debconf/Client/ConfModule.pm:160 ../../debconf-apt-progress:580 ../../debconf-communicate:75 ../../debconf-copydb:177 ../../debconf-getlang:257 ../../debconf-loadtemplate:49 ../../debconf-mergetemplate:182 ../../dpkg-preconfigure:237 ../../dpkg-reconfigure:262
msgid "Joey Hess <joeyh@debian.org>"
msgstr ""
@@ -386,21 +386,47 @@
# type: =item
#: ../../debconf-apt-progress:76
-msgid "B<--logfile> I<file>"
+msgid "B<--no-progress>"
msgstr ""
# type: textblock
#: ../../debconf-apt-progress:78
+msgid ""
+"Avoid starting, stopping, or stepping the progress bar. Progress messages "
+"from apt, media change events, and debconf questions will still be passed "
+"through to debconf."
+msgstr ""
+
+# type: =item
+#: ../../debconf-apt-progress:82
+msgid "B<--dlwaypoint> I<percentage>"
+msgstr ""
+
+# type: textblock
+#: ../../debconf-apt-progress:84
+msgid ""
+"Specify what percent of the progress bar to use for downloading packages. "
+"The remainder will be used for installing packages. The default is to use "
+"15% for downloading and the remaining 85% for installing."
+msgstr ""
+
+# type: =item
+#: ../../debconf-apt-progress:88
+msgid "B<--logfile> I<file>"
+msgstr ""
+
+# type: textblock
+#: ../../debconf-apt-progress:90
msgid "Send the normal output from apt to the given file."
msgstr ""
# type: =item
-#: ../../debconf-apt-progress:80
+#: ../../debconf-apt-progress:92
msgid "B<--logstderr>"
msgstr ""
# type: textblock
-#: ../../debconf-apt-progress:82
+#: ../../debconf-apt-progress:94
msgid ""
"Send the normal output from apt to stderr. If you supply neither "
"B<--logfile> nor B<--logstderr>, the normal output from apt will be "
@@ -408,12 +434,12 @@
msgstr ""
# type: =item
-#: ../../debconf-apt-progress:86
+#: ../../debconf-apt-progress:98
msgid "B<-->"
msgstr ""
# type: textblock
-#: ../../debconf-apt-progress:88
+#: ../../debconf-apt-progress:100
msgid ""
"Terminate options. Since you will normally need to give at least the B<-y> "
"argument to the command being run, you will usually need to use B<--> to "
@@ -422,14 +448,14 @@
msgstr ""
# type: textblock
-#: ../../debconf-apt-progress:95
+#: ../../debconf-apt-progress:107
msgid ""
"Install the GNOME desktop and an X window system development environment "
"within a progress bar:"
msgstr ""
# type: verbatim
-#: ../../debconf-apt-progress:98
+#: ../../debconf-apt-progress:110
#, no-wrap
msgid ""
" debconf-apt-progress -- aptitude -y install gnome x-window-system-dev\n"
@@ -437,7 +463,7 @@
msgstr ""
# type: textblock
-#: ../../debconf-apt-progress:100
+#: ../../debconf-apt-progress:112
msgid ""
"Install the GNOME, KDE, and XFCE desktops within a single progress bar, "
"allocating 45% of the progress bar for each of GNOME and KDE and the "
@@ -445,7 +471,7 @@
msgstr ""
# type: verbatim
-#: ../../debconf-apt-progress:104
+#: ../../debconf-apt-progress:116
#, no-wrap
msgid ""
" #! /bin/sh\n"
@@ -468,12 +494,12 @@
msgstr ""
# type: =head1
-#: ../../debconf-apt-progress:552
+#: ../../debconf-apt-progress:576
msgid "AUTHORS"
msgstr ""
# type: textblock
-#: ../../debconf-apt-progress:554
+#: ../../debconf-apt-progress:578
msgid "Colin Watson <cjwatson@debian.org>"
msgstr ""
diff -Nru /tmp/RQGGYEQVmR/debconf-1.5.11etch1/doc/man/po4a/po/fr.po /tmp/IHF7zRVfpQ/debconf-1.5.11etch2/doc/man/po4a/po/fr.po
--- debconf-1.5.11etch1/doc/man/po4a/po/fr.po 2007-09-27 12:27:20.000000000 +0200
+++ debconf-1.5.11etch2/doc/man/po4a/po/fr.po 2008-03-13 11:45:21.000000000 +0100
@@ -3,7 +3,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debconf\n"
-"POT-Creation-Date: 2007-09-27 12:27+0200\n"
+"POT-Creation-Date: 2008-03-13 10:45+0000\n"
"PO-Revision-Date: 2006-06-25 14:55+0200\n"
"Last-Translator: Florentin Duneau <f.baced@wanadoo.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -145,7 +145,7 @@
msgstr "Sp�fier la priorit�inimale des questions qui vont �e pos�."
# type: =head1
-#: ../../debconf:47 ../../debconf-apt-progress:93 ../../debconf-copydb:74
+#: ../../debconf:47 ../../debconf-apt-progress:105 ../../debconf-copydb:74
#: ../../debconf-set-selections:59
msgid "EXAMPLES"
msgstr "EXEMPLES"
@@ -212,7 +212,7 @@
# type: textblock
#: ../../debconf:111 ../../Debconf/Client/ConfModule.pm:160
-#: ../../debconf-apt-progress:556 ../../debconf-communicate:75
+#: ../../debconf-apt-progress:580 ../../debconf-communicate:75
#: ../../debconf-copydb:177 ../../debconf-getlang:257
#: ../../debconf-loadtemplate:49 ../../debconf-mergetemplate:182
#: ../../dpkg-preconfigure:237 ../../dpkg-reconfigure:262
@@ -524,21 +524,48 @@
# type: =item
#: ../../debconf-apt-progress:76
+#, fuzzy
+msgid "B<--no-progress>"
+msgstr "B<--no-reload>"
+
+# type: textblock
+#: ../../debconf-apt-progress:78
+msgid ""
+"Avoid starting, stopping, or stepping the progress bar. Progress messages "
+"from apt, media change events, and debconf questions will still be passed "
+"through to debconf."
+msgstr ""
+
+# type: =item
+#: ../../debconf-apt-progress:82
+msgid "B<--dlwaypoint> I<percentage>"
+msgstr ""
+
+# type: textblock
+#: ../../debconf-apt-progress:84
+msgid ""
+"Specify what percent of the progress bar to use for downloading packages. "
+"The remainder will be used for installing packages. The default is to use "
+"15% for downloading and the remaining 85% for installing."
+msgstr ""
+
+# type: =item
+#: ../../debconf-apt-progress:88
msgid "B<--logfile> I<file>"
msgstr "B<--logfile> I<fichier>"
# type: textblock
-#: ../../debconf-apt-progress:78
+#: ../../debconf-apt-progress:90
msgid "Send the normal output from apt to the given file."
msgstr "Envoyer la sortie normale d'APT dans le I<fichier>."
# type: =item
-#: ../../debconf-apt-progress:80
+#: ../../debconf-apt-progress:92
msgid "B<--logstderr>"
msgstr "B<--logstderr>"
# type: textblock
-#: ../../debconf-apt-progress:82
+#: ../../debconf-apt-progress:94
msgid ""
"Send the normal output from apt to stderr. If you supply neither B<--"
"logfile> nor B<--logstderr>, the normal output from apt will be discarded."
@@ -548,12 +575,12 @@
"logstderr>, la sortie normale d'APT sera d�ctiv�"
# type: =item
-#: ../../debconf-apt-progress:86
+#: ../../debconf-apt-progress:98
msgid "B<-->"
msgstr "B<-->"
# type: textblock
-#: ../../debconf-apt-progress:88
+#: ../../debconf-apt-progress:100
msgid ""
"Terminate options. Since you will normally need to give at least the B<-y> "
"argument to the command being run, you will usually need to use B<--> to "
@@ -566,7 +593,7 @@
"progress> lui-m�."
# type: textblock
-#: ../../debconf-apt-progress:95
+#: ../../debconf-apt-progress:107
msgid ""
"Install the GNOME desktop and an X window system development environment "
"within a progress bar:"
@@ -575,7 +602,7 @@
"avec une barre d'avancement."
# type: verbatim
-#: ../../debconf-apt-progress:98
+#: ../../debconf-apt-progress:110
#, no-wrap
msgid ""
" debconf-apt-progress -- aptitude -y install gnome x-window-system-dev\n"
@@ -585,7 +612,7 @@
"\n"
# type: textblock
-#: ../../debconf-apt-progress:100
+#: ../../debconf-apt-progress:112
msgid ""
"Install the GNOME, KDE, and XFCE desktops within a single progress bar, "
"allocating 45% of the progress bar for each of GNOME and KDE and the "
@@ -596,7 +623,7 @@
"10�% restants �FCE�:"
# type: verbatim
-#: ../../debconf-apt-progress:104
+#: ../../debconf-apt-progress:116
#, no-wrap
msgid ""
" #! /bin/sh\n"
@@ -636,12 +663,12 @@
"\n"
# type: SH
-#: ../../debconf-apt-progress:552
+#: ../../debconf-apt-progress:576
msgid "AUTHORS"
msgstr "AUTEURS"
# type: textblock
-#: ../../debconf-apt-progress:554
+#: ../../debconf-apt-progress:578
msgid "Colin Watson <cjwatson@debian.org>"
msgstr "Colin Watson <cjwatson@debian.org>"
diff -Nru /tmp/RQGGYEQVmR/debconf-1.5.11etch1/doc/man/po4a/po/pt_BR.po /tmp/IHF7zRVfpQ/debconf-1.5.11etch2/doc/man/po4a/po/pt_BR.po
--- debconf-1.5.11etch1/doc/man/po4a/po/pt_BR.po 2007-09-27 12:27:20.000000000 +0200
+++ debconf-1.5.11etch2/doc/man/po4a/po/pt_BR.po 2008-03-13 11:45:22.000000000 +0100
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debconf\n"
-"POT-Creation-Date: 2007-09-27 12:27+0200\n"
+"POT-Creation-Date: 2008-03-13 10:45+0000\n"
"PO-Revision-Date: 2001-12-01 19:04:00-0200\n"
"Last-Translator: Andr�u�Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -134,7 +134,7 @@
"debconf exibir�Veja acima."
# type: =head1
-#: ../../debconf:47 ../../debconf-apt-progress:93 ../../debconf-copydb:74
+#: ../../debconf:47 ../../debconf-apt-progress:105 ../../debconf-copydb:74
#: ../../debconf-set-selections:59
msgid "EXAMPLES"
msgstr "EXEMPLOS"
@@ -197,7 +197,7 @@
# type: Plain text
#: ../../debconf:111 ../../Debconf/Client/ConfModule.pm:160
-#: ../../debconf-apt-progress:556 ../../debconf-communicate:75
+#: ../../debconf-apt-progress:580 ../../debconf-communicate:75
#: ../../debconf-copydb:177 ../../debconf-getlang:257
#: ../../debconf-loadtemplate:49 ../../debconf-mergetemplate:182
#: ../../dpkg-preconfigure:237 ../../dpkg-reconfigure:262
@@ -434,35 +434,61 @@
# type: =item
#: ../../debconf-apt-progress:76
-msgid "B<--logfile> I<file>"
+msgid "B<--no-progress>"
msgstr ""
# type: textblock
#: ../../debconf-apt-progress:78
+msgid ""
+"Avoid starting, stopping, or stepping the progress bar. Progress messages "
+"from apt, media change events, and debconf questions will still be passed "
+"through to debconf."
+msgstr ""
+
+# type: =item
+#: ../../debconf-apt-progress:82
+msgid "B<--dlwaypoint> I<percentage>"
+msgstr ""
+
+# type: textblock
+#: ../../debconf-apt-progress:84
+msgid ""
+"Specify what percent of the progress bar to use for downloading packages. "
+"The remainder will be used for installing packages. The default is to use "
+"15% for downloading and the remaining 85% for installing."
+msgstr ""
+
+# type: =item
+#: ../../debconf-apt-progress:88
+msgid "B<--logfile> I<file>"
+msgstr ""
+
+# type: textblock
+#: ../../debconf-apt-progress:90
msgid "Send the normal output from apt to the given file."
msgstr ""
# type: =item
-#: ../../debconf-apt-progress:80
+#: ../../debconf-apt-progress:92
#, fuzzy
msgid "B<--logstderr>"
msgstr "B<--all>"
# type: textblock
-#: ../../debconf-apt-progress:82
+#: ../../debconf-apt-progress:94
msgid ""
"Send the normal output from apt to stderr. If you supply neither B<--"
"logfile> nor B<--logstderr>, the normal output from apt will be discarded."
msgstr ""
# type: =item
-#: ../../debconf-apt-progress:86
+#: ../../debconf-apt-progress:98
#, fuzzy
msgid "B<-->"
msgstr "B<--apt>"
# type: textblock
-#: ../../debconf-apt-progress:88
+#: ../../debconf-apt-progress:100
msgid ""
"Terminate options. Since you will normally need to give at least the B<-y> "
"argument to the command being run, you will usually need to use B<--> to "
@@ -471,14 +497,14 @@
msgstr ""
# type: textblock
-#: ../../debconf-apt-progress:95
+#: ../../debconf-apt-progress:107
msgid ""
"Install the GNOME desktop and an X window system development environment "
"within a progress bar:"
msgstr ""
# type: verbatim
-#: ../../debconf-apt-progress:98
+#: ../../debconf-apt-progress:110
#, no-wrap
msgid ""
" debconf-apt-progress -- aptitude -y install gnome x-window-system-dev\n"
@@ -486,7 +512,7 @@
msgstr ""
# type: textblock
-#: ../../debconf-apt-progress:100
+#: ../../debconf-apt-progress:112
msgid ""
"Install the GNOME, KDE, and XFCE desktops within a single progress bar, "
"allocating 45% of the progress bar for each of GNOME and KDE and the "
@@ -494,7 +520,7 @@
msgstr ""
# type: verbatim
-#: ../../debconf-apt-progress:104
+#: ../../debconf-apt-progress:116
#, no-wrap
msgid ""
" #! /bin/sh\n"
@@ -517,13 +543,13 @@
msgstr ""
# type: =head1
-#: ../../debconf-apt-progress:552
+#: ../../debconf-apt-progress:576
#, fuzzy
msgid "AUTHORS"
msgstr "AUTOR"
# type: Plain text
-#: ../../debconf-apt-progress:554
+#: ../../debconf-apt-progress:578
#, fuzzy
msgid "Colin Watson <cjwatson@debian.org>"
msgstr "Joey Hess E<lt>joeyh@debian.orgE<gt>"
diff -Nru /tmp/RQGGYEQVmR/debconf-1.5.11etch1/doc/man/po4a/po/ru.po /tmp/IHF7zRVfpQ/debconf-1.5.11etch2/doc/man/po4a/po/ru.po
--- debconf-1.5.11etch1/doc/man/po4a/po/ru.po 2007-09-27 12:27:21.000000000 +0200
+++ debconf-1.5.11etch2/doc/man/po4a/po/ru.po 2008-03-13 11:45:23.000000000 +0100
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debconf_man\n"
-"POT-Creation-Date: 2007-09-27 12:27+0200\n"
+"POT-Creation-Date: 2008-03-13 10:45+0000\n"
"PO-Revision-Date: 2006-07-04 21:42+0300\n"
"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -148,7 +148,7 @@
msgstr "Установить минимальный приоритет задаваемых вопросов."
# type: Content of: <refentry><refsect1><title>
-#: ../../debconf:47 ../../debconf-apt-progress:93 ../../debconf-copydb:74
+#: ../../debconf:47 ../../debconf-apt-progress:105 ../../debconf-copydb:74
#: ../../debconf-set-selections:59
msgid "EXAMPLES"
msgstr "ПРИМЕРЫ"
@@ -214,7 +214,7 @@
# type: textblock
#: ../../debconf:111 ../../Debconf/Client/ConfModule.pm:160
-#: ../../debconf-apt-progress:556 ../../debconf-communicate:75
+#: ../../debconf-apt-progress:580 ../../debconf-communicate:75
#: ../../debconf-copydb:177 ../../debconf-getlang:257
#: ../../debconf-loadtemplate:49 ../../debconf-mergetemplate:182
#: ../../dpkg-preconfigure:237 ../../dpkg-reconfigure:262
@@ -524,21 +524,48 @@
# type: =item
#: ../../debconf-apt-progress:76
+#, fuzzy
+msgid "B<--no-progress>"
+msgstr "B<--no-reload>"
+
+# type: textblock
+#: ../../debconf-apt-progress:78
+msgid ""
+"Avoid starting, stopping, or stepping the progress bar. Progress messages "
+"from apt, media change events, and debconf questions will still be passed "
+"through to debconf."
+msgstr ""
+
+# type: =item
+#: ../../debconf-apt-progress:82
+msgid "B<--dlwaypoint> I<percentage>"
+msgstr ""
+
+# type: textblock
+#: ../../debconf-apt-progress:84
+msgid ""
+"Specify what percent of the progress bar to use for downloading packages. "
+"The remainder will be used for installing packages. The default is to use "
+"15% for downloading and the remaining 85% for installing."
+msgstr ""
+
+# type: =item
+#: ../../debconf-apt-progress:88
msgid "B<--logfile> I<file>"
msgstr "B<--logfile> I<файл>"
# type: textblock
-#: ../../debconf-apt-progress:78
+#: ../../debconf-apt-progress:90
msgid "Send the normal output from apt to the given file."
msgstr "Направить результат работы apt в указанный файл."
# type: =item
-#: ../../debconf-apt-progress:80
+#: ../../debconf-apt-progress:92
msgid "B<--logstderr>"
msgstr "B<--logstderr>"
# type: textblock
-#: ../../debconf-apt-progress:82
+#: ../../debconf-apt-progress:94
msgid ""
"Send the normal output from apt to stderr. If you supply neither B<--"
"logfile> nor B<--logstderr>, the normal output from apt will be discarded."
@@ -548,12 +575,12 @@
"пропадут."
# type: =item
-#: ../../debconf-apt-progress:86
+#: ../../debconf-apt-progress:98
msgid "B<-->"
msgstr "B<-->"
# type: textblock
-#: ../../debconf-apt-progress:88
+#: ../../debconf-apt-progress:100
msgid ""
"Terminate options. Since you will normally need to give at least the B<-y> "
"argument to the command being run, you will usually need to use B<--> to "
@@ -565,7 +592,7 @@
"эти параметры от параметров B<debconf-apt-progress>."
# type: textblock
-#: ../../debconf-apt-progress:95
+#: ../../debconf-apt-progress:107
msgid ""
"Install the GNOME desktop and an X window system development environment "
"within a progress bar:"
@@ -574,7 +601,7 @@
"выводом индикатора выполнения:"
# type: verbatim
-#: ../../debconf-apt-progress:98
+#: ../../debconf-apt-progress:110
#, no-wrap
msgid ""
" debconf-apt-progress -- aptitude -y install gnome x-window-system-dev\n"
@@ -584,7 +611,7 @@
"\n"
# type: textblock
-#: ../../debconf-apt-progress:100
+#: ../../debconf-apt-progress:112
msgid ""
"Install the GNOME, KDE, and XFCE desktops within a single progress bar, "
"allocating 45% of the progress bar for each of GNOME and KDE and the "
@@ -594,7 +621,7 @@
"отдав по 45% индикатора выполнения GNOME и KDE, а оставшиеся 10% под XFCE:"
# type: verbatim
-#: ../../debconf-apt-progress:104
+#: ../../debconf-apt-progress:116
#, no-wrap
msgid ""
" #! /bin/sh\n"
@@ -634,12 +661,12 @@
"\n"
# type: =head1
-#: ../../debconf-apt-progress:552
+#: ../../debconf-apt-progress:576
msgid "AUTHORS"
msgstr "АВТОРЫ"
# type: textblock
-#: ../../debconf-apt-progress:554
+#: ../../debconf-apt-progress:578
msgid "Colin Watson <cjwatson@debian.org>"
msgstr "Colin Watson <cjwatson@debian.org>"
Attachment:
signature.asc
Description: Digital signature