diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-03-25 08:52:20 +0100 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-03-25 08:52:20 +0100 |
commit | c510253888191fe9537559ad2fdd982dc3fd89eb (patch) | |
tree | f02aef33a0d9bb2ca7daa92d6e6ad1ede4ae0bc8 | |
parent | f990b0b411bbec41209aa663224b8b65c2091dda (diff) | |
download | apt-c510253888191fe9537559ad2fdd982dc3fd89eb.tar.gz |
merge patch from Daniel Hartwig
-rw-r--r-- | cmdline/apt-get.cc | 2 | ||||
-rw-r--r-- | debian/changelog | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index e3c74a099..64b062ea4 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2714,7 +2714,7 @@ bool DoSource(CommandLine &CmdL) { string buildopts = _config->Find("APT::Get::Host-Architecture"); if (buildopts.empty() == false) - buildopts = "-a " + buildopts + " "; + buildopts = "-a" + buildopts + " "; buildopts.append(_config->Find("DPkg::Build-Options","-b -uc")); // Call dpkg-buildpackage diff --git a/debian/changelog b/debian/changelog index cf04c1dd2..fbc6009a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ apt (0.9.7.9~exp2) UNRELEASED; urgency=low [ Programs translations ] * Update all PO files and apt-all.pot * French translation completed (Christian Perrier) + + [ Daniel Hartwig ] + * cmdline/apt-get.cc: + - do not have space between "-a" and option when cross building + (closes: #703792) -- Christian Perrier <bubulle@debian.org> Sun, 24 Mar 2013 08:57:45 +0100 |