Procházet zdrojové kódy

merge patch from Daniel Hartwig

Michael Vogt před 13 roky
rodič
revize
c510253888
2 změnil soubory, kde provedl 6 přidání a 1 odebrání
  1. 1 1
      cmdline/apt-get.cc
  2. 5 0
      debian/changelog

+ 1 - 1
cmdline/apt-get.cc

@@ -2714,7 +2714,7 @@ bool DoSource(CommandLine &CmdL)
 	 {
 	 {
 	    string buildopts = _config->Find("APT::Get::Host-Architecture");
 	    string buildopts = _config->Find("APT::Get::Host-Architecture");
 	    if (buildopts.empty() == false)
 	    if (buildopts.empty() == false)
-	       buildopts = "-a " + buildopts + " ";
+	       buildopts = "-a" + buildopts + " ";
 	    buildopts.append(_config->Find("DPkg::Build-Options","-b -uc"));
 	    buildopts.append(_config->Find("DPkg::Build-Options","-b -uc"));
 
 
 	    // Call dpkg-buildpackage
 	    // Call dpkg-buildpackage

+ 5 - 0
debian/changelog

@@ -3,6 +3,11 @@ apt (0.9.7.9~exp2) UNRELEASED; urgency=low
   [ Programs translations ]
   [ Programs translations ]
   * Update all PO files and apt-all.pot
   * Update all PO files and apt-all.pot
   * French translation completed (Christian Perrier)
   * 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
  -- Christian Perrier <bubulle@debian.org>  Sun, 24 Mar 2013 08:57:45 +0100