From: Michael Vogt <mvo@debian.org>
Date: Sun, 26 Jan 2014 07:15:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
X-Git-Tag: 0.9.15.1~11
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/796673c38509300c988fbba2f2679ba3c76916db

Merge remote-tracking branch 'donkult/debian/sid' into debian/sid

Conflicts:
	apt-private/private-list.cc
	doc/po/de.po
	test/integration/framework
---

796673c38509300c988fbba2f2679ba3c76916db
diff --cc apt-private/private-list.cc
index fbb66d204,898ee7222..44a766c84
--- a/apt-private/private-list.cc
+++ b/apt-private/private-list.cc
@@@ -101,15 -101,11 +101,15 @@@ private
  									/*}}}*/
  void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records,	/*{{{*/
                       pkgCache::PkgIterator P,    
 -                     std::ostream &outs)
 +                     std::ostream &outs,
 +                     bool include_summary=true)
  {
     for (pkgCache::VerIterator Ver = P.VersionList();
-         Ver.end() == false; Ver++) 
 -        Ver.end() == false; ++Ver) 
 -      ListSingleVersion(CacheFile, records, Ver, outs);
++        Ver.end() == false; ++Ver)
 +   {
 +      ListSingleVersion(CacheFile, records, Ver, outs, include_summary);
 +      outs << "\n";
 +   }
  }
  									/*}}}*/
  // list - list package based on criteria        			/*{{{*/
diff --cc doc/po/de.po
index 3c9799fe1,67c3f992b..61f99ee81
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@@ -1,14 -1,14 +1,29 @@@
--# Translation of apt-doc to German
--# Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
--# This file is distributed under the same license as the apt-doc package.
- # Chris Leick <c.leick@vollbio.de>, 2009-2012.
 -# Chris Leick <c.leick@vollbio.de>, 2009-2014.
++# SOME DESCRIPTIVE TITLE.
++# Copyright (C) YEAR Free Software Foundation, Inc.
++# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  #
++#, fuzzy
  msgid ""
  msgstr ""
- "Project-Id-Version: apt-doc 0.9.7\n"
 -"Project-Id-Version: apt-doc 0.9.14.2\n"
--"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
- "POT-Creation-Date: 2014-01-25 22:21+0100\n"
- "PO-Revision-Date: 2012-06-25 22:49+0100\n"
++"Project-Id-Version: PACKAGE VERSION\n"
++"PO-Revision-Date: 2014-01-26 08:14+0100\n"
++"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
++"Language-Team: LANGUAGE <LL@li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=CHARSET\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#~ # Translation of apt-doc to German
++#~ # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
++#~ # This file is distributed under the same license as the apt-doc package.
++#~ # Chris Leick <c.leick@vollbio.de>, 2009-2014.
++#~ #
++#~ msgid ""
++#~ msgstr ""
++#~ "Project-Id-Version: apt-doc 0.9.14.2\n"
++#~ "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+ "POT-Creation-Date: 2014-01-24 12:29+0100\n"
+ "PO-Revision-Date: 2014-01-21 20:59+0100\n"
  "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
  "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
  "Language: de\n"
@@@ -6893,15 -6833,15 +6912,15 @@@ msgid "
  "<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
  "architectures from the set which will be downloaded."
  msgstr ""
- "<literal>arch=<replaceable>Architektur1</replaceable>,"
- "<replaceable>Architektur2</replaceable>, …</literal> kann benutzt werden, um "
- "anzugeben, für welche Architekturen Paketinformationen heruntergeladen "
- "werden sollen. Falls diese Option nicht gesetzt ist, werden alle durch die "
- "Option <literal>APT::Architectures</literal> definierten Architekturen "
- "heruntergeladen."
+ "<literal>arch+=<replaceable>Architektur1</replaceable>,"
+ "<replaceable>Architektur2</replaceable>, …</literal> und <literal>arch-"
+ "=<replaceable>Architektur1</replaceable>,<replaceable>Architektur2</"
+ "replaceable>, …</literal>, die benutzt werden können, um der "
+ "Zusammenstellung, die heruntergeladen werden soll, Architekturen "
+ "hinzuzufügen oder zu entfernen."
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 -#: sources.list.5.xml:127
 +#: sources.list.5.xml:149
  msgid ""
  "<literal>trusted=yes</literal> can be set to indicate that packages from "
  "this source are always authenticated even if the <filename>Release</"
diff --cc test/integration/framework
index ca2f90050,3ea9f3774..5439244f7
--- a/test/integration/framework
+++ b/test/integration/framework
@@@ -87,27 -93,28 +93,29 @@@ msgdone() 
  
  runapt() {
  	msgdebug "Executing: ${CCMD}$*${CDEBUG} "
+ 	local CMD="$1"
+ 	shift
  	if [ -f ./aptconfig.conf ]; then
- 		MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$*
+ 		MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$CMD "$@"
  	elif [ -f ../aptconfig.conf ]; then
- 		MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$*
+ 		MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$CMD "$@"
  	else
- 		MALLOC_PERTURB_=21 MALLOC_CHECK_=2 LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$*
+ 		MALLOC_PERTURB_=21 MALLOC_CHECK_=2 LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$CMD "$@"
  	fi
  }
- aptconfig() { runapt apt-config $*; }
- aptcache() { runapt apt-cache $*; }
- aptcdrom() { runapt apt-cdrom $*; }
- aptget() { runapt apt-get $*; }
- apt() { runapt apt $*; }
- aptftparchive() { runapt apt-ftparchive $*; }
- aptkey() { runapt apt-key $*; }
- aptmark() { runapt apt-mark $*; }
+ aptconfig() { runapt apt-config "$@"; }
+ aptcache() { runapt apt-cache "$@"; }
+ aptcdrom() { runapt apt-cdrom "$@"; }
+ aptget() { runapt apt-get "$@"; }
+ aptftparchive() { runapt apt-ftparchive "$@"; }
+ aptkey() { runapt apt-key "$@"; }
+ aptmark() { runapt apt-mark "$@"; }
++apt() { runapt apt "$@"; }
  aptwebserver() {
-   LD_LIBRARY_PATH=${APTWEBSERVERBINDIR} ${APTWEBSERVERBINDIR}/aptwebserver $*;
+   LD_LIBRARY_PATH=${APTWEBSERVERBINDIR} ${APTWEBSERVERBINDIR}/aptwebserver "$@";
  }
  dpkg() {
- 	$(which dpkg) --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log $*
+ 	command dpkg --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log "$@"
  }
  aptitude() {
  	if [ -f ./aptconfig.conf ]; then
@@@ -203,10 -217,23 +218,24 @@@ setupenvironment() 
  	echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf
  	echo 'quiet::NoUpdate "true";' >> aptconfig.conf
  	echo "Acquire::https::CaInfo \"${TESTDIR}/apt.pem\";" > rootdir/etc/apt/apt.conf.d/99https
 +        echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary
- 	export LC_ALL=C
+ 	export LC_ALL=C.UTF-8
  	export PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin"
  	configcompression '.' 'gz' #'bz2' 'lzma' 'xz'
+ 
+ 	# gpg needs a trustdb to function, but it can't be invalid (not even empty)
+ 	# see also apt-key where this trickery comes from:
+ 	local TRUSTDBDIR="${TMPWORKINGDIRECTORY}/gnupghome"
+ 	mkdir "$TRUSTDBDIR"
+ 	chmod 700 "$TRUSTDBDIR"
+ 	# We also don't use a secret keyring, of course, but gpg panics and
+ 	# implodes if there isn't one available - and writeable for imports
+ 	local SECRETKEYRING="${TRUSTDBDIR}/secring.gpg"
+ 	touch $SECRETKEYRING
+ 	# now create the trustdb with an (empty) dummy keyring
+ 	# newer gpg versions are fine without it, but play it safe for now
+ 	gpg --quiet --check-trustdb --secret-keyring $SECRETKEYRING --keyring $SECRETKEYRING >/dev/null 2>&1
+ 
  	msgdone "info"
  }
  
@@@ -951,20 -997,10 +999,20 @@@ testempty() 
  }
  
  testequal() {
 +	local MSG='Test of equality of'
 +	if [ "$1" = '--nomsg' ]; then
 +		MSG=''
 +		shift
 +	fi
 +
- 	local COMPAREFILE=$(mktemp)
+ 	local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequal.comparefile"
 +	addtrap "rm $COMPAREFILE;"
  	echo "$1" > $COMPAREFILE
  	shift
 -	msgtest "Test for equality of" "$*"
 +
 +	if [ -n "$MSG" ]; then
 +		msgtest "$MSG" "$*"
 +	fi
  	$* 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
  }