Bug#188364: Patch to create /var/lib/apt/archives/.. and /var/cache/apt/archives/... when not existing
Package: apt
Version: unavailable; reported 2003-05-15
Followup-For: Bug #188364
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hello,
I've made a patch to close this bug report. It would be nice to have it for
diskless systems or when mounting the rw filesystems like /var on tmpfs.
Regards
Torsten Knodt
- -- System Information:
Debian Release: testing/unstable
Architecture: sh: line 1: /usr/bin/dpkg: Permission denied
Kernel: Linux tk-hybrid-1 2.4.20 #4 Son Mai 4 12:23:33 CEST 2003 i586
Locale: LANG=C, LC_CTYPE=C
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)
iD8DBQE+w5wEX1/CjdwsodIRAjsyAJ95EexZ0051ynrH+Ct8RwSXzoWFWwCdGNZm
8QUYA+kWrXy9e2PfdtfdKI4=
=HVAy
-----END PGP SIGNATURE-----
diff -uriwbB apt-0.5.5/apt-pkg/acquire.cc apt-0.5.5.1/apt-pkg/acquire.cc
--- apt-0.5.5/apt-pkg/acquire.cc 2001-05-27 06:28:37.000000000 +0200
+++ apt-0.5.5.1/apt-pkg/acquire.cc 2003-05-15 13:12:53.000000000 +0200
@@ -56,10 +56,18 @@
// This is really a stupid place for this
struct stat St;
+ if (stat((_config->FindDir("Dir::State::lists")).c_str(),&St) == - ENOENT)
+ mkdir((_config->FindDir("Dir::State::lists")).c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
+ if (stat((_config->FindDir("Dir::State::lists") + "partial/").c_str(),&St) == - ENOENT)
+ mkdir((_config->FindDir("Dir::State::lists") + "partial/").c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
if (stat((_config->FindDir("Dir::State::lists") + "partial/").c_str(),&St) != 0 ||
S_ISDIR(St.st_mode) == 0)
_error->Error(_("Lists directory %spartial is missing."),
_config->FindDir("Dir::State::lists").c_str());
+ if (stat((_config->FindDir("Dir::Cache::Archives")).c_str(),&St) == - ENOENT)
+ mkdir((_config->FindDir("Dir::Cache::Archives")).c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
+ if (stat((_config->FindDir("Dir::Cache::Archives") + "partial/").c_str(),&St) == - ENOENT)
+ mkdir((_config->FindDir("Dir::Cache::Archives") + "partial/").c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
if (stat((_config->FindDir("Dir::Cache::Archives") + "partial/").c_str(),&St) != 0 ||
S_ISDIR(St.st_mode) == 0)
_error->Error(_("Archive directory %spartial is missing."),
diff -uriwbB apt-0.5.5/buildlib/config.guess apt-0.5.5.1/buildlib/config.guess
--- apt-0.5.5/buildlib/config.guess 2003-01-11 21:49:45.000000000 +0100
+++ apt-0.5.5.1/buildlib/config.guess 2003-05-10 15:46:10.000000000 +0200
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2003-01-10'
+timestamp='2003-05-09'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -235,72 +235,51 @@
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- *:MicroBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
- exit 0 ;;
alpha:OSF1:*:*)
if test $UNAME_RELEASE = "V4.0"; then
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
fi
+ # According to Compaq, /usr/sbin/psrinfo has been available on
+ # OSF/1 and Tru64 systems produced since 1995. I hope that
+ # covers most systems running today. This code pipes the CPU
+ # types through head -n 1, so we only detect the type of CPU 0.
+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ case "$ALPHA_CPU_TYPE" in
+ "EV4 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "EV4.5 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "LCA4 (21066/21068)")
+ UNAME_MACHINE="alpha" ;;
+ "EV5 (21164)")
+ UNAME_MACHINE="alphaev5" ;;
+ "EV5.6 (21164A)")
+ UNAME_MACHINE="alphaev56" ;;
+ "EV5.6 (21164PC)")
+ UNAME_MACHINE="alphapca56" ;;
+ "EV5.7 (21164PC)")
+ UNAME_MACHINE="alphapca57" ;;
+ "EV6 (21264)")
+ UNAME_MACHINE="alphaev6" ;;
+ "EV6.7 (21264A)")
+ UNAME_MACHINE="alphaev67" ;;
+ "EV6.8CB (21264C)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8AL (21264B)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8CX (21264D)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.9A (21264/EV69A)")
+ UNAME_MACHINE="alphaev69" ;;
+ "EV7 (21364)")
+ UNAME_MACHINE="alphaev7" ;;
+ "EV7.9 (21364A)")
+ UNAME_MACHINE="alphaev79" ;;
+ esac
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- eval $set_cc_for_build
- cat <<EOF >$dummy.s
- .data
-\$Lformat:
- .byte 37,100,45,37,120,10,0 # "%d-%x\n"
-
- .text
- .globl main
- .align 4
- .ent main
-main:
- .frame \$30,16,\$26,0
- ldgp \$29,0(\$27)
- .prologue 1
- .long 0x47e03d80 # implver \$0
- lda \$2,-1
- .long 0x47e20c21 # amask \$2,\$1
- lda \$16,\$Lformat
- mov \$0,\$17
- not \$1,\$18
- jsr \$26,printf
- ldgp \$29,0(\$26)
- mov 0,\$16
- jsr \$26,exit
- .end main
-EOF
- $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
- if test "$?" = 0 ; then
- case `$dummy` in
- 0-0)
- UNAME_MACHINE="alpha"
- ;;
- 1-0)
- UNAME_MACHINE="alphaev5"
- ;;
- 1-1)
- UNAME_MACHINE="alphaev56"
- ;;
- 1-101)
- UNAME_MACHINE="alphapca56"
- ;;
- 2-303)
- UNAME_MACHINE="alphaev6"
- ;;
- 2-307)
- UNAME_MACHINE="alphaev67"
- ;;
- 2-1307)
- UNAME_MACHINE="alphaev68"
- ;;
- 3-1307)
- UNAME_MACHINE="alphaev7"
- ;;
- esac
- fi
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;;
Alpha\ *:Windows_NT*:*)
@@ -765,7 +744,7 @@
*:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
- *:FreeBSD:*:*)
+ *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
# Determine whether the default compiler uses glibc.
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -1054,7 +1033,7 @@
exit 0 ;;
M68*:*:R3V[567]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
+ 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
diff -uriwbB apt-0.5.5/buildlib/config.sub apt-0.5.5.1/buildlib/config.sub
--- apt-0.5.5/buildlib/config.sub 2003-01-11 21:49:45.000000000 +0100
+++ apt-0.5.5.1/buildlib/config.sub 2003-05-10 15:46:10.000000000 +0200
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2003-01-03'
+timestamp='2003-05-09'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -257,7 +257,7 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
| strongarm \
@@ -296,7 +296,7 @@
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* \
| bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
@@ -329,11 +329,13 @@
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
+ | tahoe-* | thumb-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
@@ -371,6 +373,9 @@
basic_machine=a29k-none
os=-bsd
;;
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
amdahl)
basic_machine=580-amdahl
os=-sysv
@@ -925,6 +930,14 @@
basic_machine=tic54x-unknown
os=-coff
;;
+ tic55x | c55x*)
+ basic_machine=tic55x-unknown
+ os=-coff
+ ;;
+ tic6x | c6x*)
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
@@ -1027,7 +1040,7 @@
we32k)
basic_machine=we32k-att
;;
- sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
+ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sh64)
@@ -1118,7 +1131,7 @@
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -microbsd*)
+ | -powermax* | -dnix*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1227,6 +1240,12 @@
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
os=-mint
;;
+ -aros*)
+ os=-aros
+ ;;
+ -kaos*)
+ os=-kaos
+ ;;
-none)
;;
*)
diff -uriwbB apt-0.5.5/cmdline/apt-get.cc apt-0.5.5.1/cmdline/apt-get.cc
--- apt-0.5.5/cmdline/apt-get.cc 2003-04-27 07:59:33.000000000 +0200
+++ apt-0.5.5.1/cmdline/apt-get.cc 2003-05-15 14:11:56.000000000 +0200
@@ -723,6 +723,9 @@
if (_config->FindB("Debug::NoLocking",false) == false &&
_config->FindB("APT::Get::Print-URIs") == false)
{
+ struct stat buf;
+ if(stat(_config->FindDir("Dir::Cache::Archives").c_str(), &buf) == -ENOENT)
+ mkdir(_config->FindDir("Dir::Cache:Archives").c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
Lock.Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
if (_error->PendingError() == true)
return _error->Error(_("Unable to lock the download directory"));
@@ -1228,6 +1231,9 @@
FileFd Lock;
if (_config->FindB("Debug::NoLocking",false) == false)
{
+ struct stat buf;
+ if(stat(_config->FindDir("Dir::State::Lists").c_str(), &buf) == -ENOENT)
+ mkdir(_config->FindDir("Dir::State::Lists").c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));
if (_error->PendingError() == true)
return _error->Error(_("Unable to lock the list directory"));
@@ -1689,6 +1695,9 @@
FileFd Lock;
if (_config->FindB("Debug::NoLocking",false) == false)
{
+ struct stat buf;
+ if(stat(_config->FindDir("Dir::Cache::Archives").c_str(), &buf) == -ENOENT)
+ mkdir(_config->FindDir("Dir::Cache:Archives").c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
Lock.Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
if (_error->PendingError() == true)
return _error->Error(_("Unable to lock the download directory"));
@@ -1722,6 +1731,9 @@
FileFd Lock;
if (_config->FindB("Debug::NoLocking",false) == false)
{
+ struct stat buf;
+ if(stat(_config->FindDir("Dir::Cache::Archives").c_str(), &buf) == -ENOENT)
+ mkdir(_config->FindDir("Dir::Cache:Archives").c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
Lock.Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
if (_error->PendingError() == true)
return _error->Error(_("Unable to lock the download directory"));
diff -uriwbB apt-0.5.5/configure apt-0.5.5.1/configure
--- apt-0.5.5/configure 2003-04-27 08:24:39.000000000 +0200
+++ apt-0.5.5.1/configure 2003-05-15 12:56:21.000000000 +0200
@@ -563,7 +563,7 @@
cat >> confdefs.h <<EOF
-#define VERSION "0.5.5"
+#define VERSION "0.5.5.1"
EOF
PACKAGE="apt"
diff -uriwbB apt-0.5.5/configure.in apt-0.5.5.1/configure.in
--- apt-0.5.5/configure.in 2003-04-27 08:24:37.000000000 +0200
+++ apt-0.5.5.1/configure.in 2003-05-15 12:56:21.000000000 +0200
@@ -17,7 +17,7 @@
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.5.5")
+AC_DEFINE_UNQUOTED(VERSION,"0.5.5.1")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff -uriwbB apt-0.5.5/debian/changelog apt-0.5.5.1/debian/changelog
--- apt-0.5.5/debian/changelog 2003-04-27 08:23:36.000000000 +0200
+++ apt-0.5.5.1/debian/changelog 2003-05-15 12:54:12.000000000 +0200
@@ -1,3 +1,9 @@
+apt (0.5.5.1) unstable; urgency=low
+
+ * Create /var/cache/apt/... and /var/lib/apt/... when not existing (Closes: #188364)
+
+ -- Torsten Knodt <tk-debian@datas-world.de> Thu, 15 May 2003 12:52:30 +0200
+
apt (0.5.5) unstable; urgency=low
* New deb version compare function, that has no integer limits, and
Nur in apt-0.5.5.1/doc: apt-cache.8.
Nur in apt-0.5.5.1/doc: apt-cdrom.8.
Nur in apt-0.5.5.1/doc: apt.conf.5.
Nur in apt-0.5.5.1/doc: apt-config.8.
Nur in apt-0.5.5.1/doc: apt-extracttemplates.1.
Nur in apt-0.5.5.1/doc: apt-ftparchive.1.
Nur in apt-0.5.5.1/doc: apt-get.8.
Nur in apt-0.5.5.1/doc: apt_preferences.5.
Nur in apt-0.5.5.1/doc: apt-sortpkgs.1.
Nur in apt-0.5.5.1/doc/fr: apt-cdrom.fr.8.
Nur in apt-0.5.5.1/doc/fr: apt.conf.fr.5.
Nur in apt-0.5.5.1/doc/fr: apt-config.fr.8.
Nur in apt-0.5.5.1/doc/fr: apt-extracttemplates.fr.1.
Nur in apt-0.5.5.1/doc/fr: apt-ftparchive.fr.1.
Nur in apt-0.5.5.1/doc/fr: apt_preferences.fr.5.
Nur in apt-0.5.5.1/doc/fr: apt-sortpkgs.fr.1.
Nur in apt-0.5.5.1/doc/fr: manpage.links.
Nur in apt-0.5.5.1/doc/fr: manpage.refs.
Nur in apt-0.5.5.1/doc: manpage.links.
Nur in apt-0.5.5.1/doc: manpage.refs.
Nur in apt-0.5.5.1/doc/pt_BR: apt_preferences.pt_BR.5.
Nur in apt-0.5.5.1/doc/pt_BR: manpage.links.
Nur in apt-0.5.5.1/doc/pt_BR: manpage.refs.
Nur in apt-0.5.5.1/doc: sources.list.5.
Nur in apt-0.5.5.1/doc: vendors.list.5.
diff -uriwbB apt-0.5.5/po/apt-all.pot apt-0.5.5.1/po/apt-all.pot
--- apt-0.5.5/po/apt-all.pot 2003-04-27 08:21:55.000000000 +0200
+++ apt-0.5.5.1/po/apt-all.pot 2003-05-15 14:16:47.000000000 +0200
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-04-27 01:12-0500\n"
+"POT-Creation-Date: 2003-05-15 14:16+0200\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"
@@ -143,7 +143,7 @@
#: cmdline/apt-cache.cc:1574 cmdline/apt-cdrom.cc:730 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:544
-#: cmdline/apt-get.cc:2165 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2177 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
@@ -634,53 +634,53 @@
msgid "Packages need to be removed but Remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:728 cmdline/apt-get.cc:1694 cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:731 cmdline/apt-get.cc:1703 cmdline/apt-get.cc:1739
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:738 cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:741 cmdline/apt-get.cc:1787 cmdline/apt-get.cc:1998
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
-#: cmdline/apt-get.cc:758
+#: cmdline/apt-get.cc:761
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:761
+#: cmdline/apt-get.cc:764
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:766
+#: cmdline/apt-get.cc:769
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
-#: cmdline/apt-get.cc:769
+#: cmdline/apt-get.cc:772
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:789
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:798
msgid "There are problems and -y was used without --force-yes"
msgstr ""
-#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:804 cmdline/apt-get.cc:824
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:803
+#: cmdline/apt-get.cc:806
msgid "Yes, do as I say!"
msgstr ""
-#: cmdline/apt-get.cc:805
+#: cmdline/apt-get.cc:808
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -688,74 +688,74 @@
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:814 cmdline/apt-get.cc:833
msgid "Abort."
msgstr ""
-#: cmdline/apt-get.cc:826
+#: cmdline/apt-get.cc:829
msgid "Do you want to continue? [Y/n] "
msgstr ""
-#: cmdline/apt-get.cc:895 cmdline/apt-get.cc:1266 cmdline/apt-get.cc:1884
+#: cmdline/apt-get.cc:898 cmdline/apt-get.cc:1272 cmdline/apt-get.cc:1896
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:913
+#: cmdline/apt-get.cc:916
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:914 cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:917 cmdline/apt-get.cc:1905
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:920
+#: cmdline/apt-get.cc:923
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:927
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:932
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:930
+#: cmdline/apt-get.cc:933
msgid "Aborting Install."
msgstr ""
-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:966
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
-#: cmdline/apt-get.cc:973
+#: cmdline/apt-get.cc:976
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:994
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1017
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1027
#, c-format
msgid ""
"Package %s has no available version, but exists in the database.\n"
@@ -764,84 +764,84 @@
"of sources.list\n"
msgstr ""
-#: cmdline/apt-get.cc:1044
+#: cmdline/apt-get.cc:1047
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:1047
+#: cmdline/apt-get.cc:1050
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1078
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1102
+#: cmdline/apt-get.cc:1105
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1110
+#: cmdline/apt-get.cc:1113
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1220
+#: cmdline/apt-get.cc:1223
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1233
+#: cmdline/apt-get.cc:1239
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1285
+#: cmdline/apt-get.cc:1291
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1304
+#: cmdline/apt-get.cc:1310
msgid "Internal Error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1394 cmdline/apt-get.cc:1430
+#: cmdline/apt-get.cc:1400 cmdline/apt-get.cc:1436
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1407
+#: cmdline/apt-get.cc:1413
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1423
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1447
+#: cmdline/apt-get.cc:1453
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1450
+#: cmdline/apt-get.cc:1456
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1468
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -849,140 +849,140 @@
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1470
+#: cmdline/apt-get.cc:1476
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-#: cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:1481
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1478
+#: cmdline/apt-get.cc:1484
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1510
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1574
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1569
+#: cmdline/apt-get.cc:1575
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1589
+#: cmdline/apt-get.cc:1595
msgid "Calculating Upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1592 methods/ftp.cc:700 methods/connect.cc:99
+#: cmdline/apt-get.cc:1598 methods/ftp.cc:700 methods/connect.cc:99
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1597
+#: cmdline/apt-get.cc:1603
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1770
+#: cmdline/apt-get.cc:1782
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2004
+#: cmdline/apt-get.cc:1809 cmdline/apt-get.cc:2016
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1856
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1849
+#: cmdline/apt-get.cc:1861
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1852
+#: cmdline/apt-get.cc:1864
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1858
+#: cmdline/apt-get.cc:1870
#, c-format
msgid "Fetch Source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1889
+#: cmdline/apt-get.cc:1901
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:1917
+#: cmdline/apt-get.cc:1929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1929
+#: cmdline/apt-get.cc:1941
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1946
+#: cmdline/apt-get.cc:1958
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1977
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:1981
+#: cmdline/apt-get.cc:1993
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2009
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2029
+#: cmdline/apt-get.cc:2041
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2076
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2106
+#: cmdline/apt-get.cc:2118
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2133
+#: cmdline/apt-get.cc:2145
msgid ""
"Some broken packages were found while trying to process build-dependencies.\n"
"You might want to run `apt-get -f install' to correct these."
msgstr ""
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2150
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2170
+#: cmdline/apt-get.cc:2182
msgid "Supported Modules:"
msgstr ""
-#: cmdline/apt-get.cc:2211
+#: cmdline/apt-get.cc:2223
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1235,7 +1235,7 @@
msgstr ""
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:701
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:412 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:420 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1812,7 +1812,7 @@
msgid "Unable to stat the mount point %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:426 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr ""
@@ -2072,12 +2072,12 @@
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/acquire.cc:61
+#: apt-pkg/acquire.cc:65
#, c-format
msgid "Lists directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:65
+#: apt-pkg/acquire.cc:73
#, c-format
msgid "Archive directory %spartial is missing."
msgstr ""
Reply to: