do not require unused partial dirs in 'source' (Closes: #633510)

diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index e3a4435b8d7d913d7a37706d1ebf5dd9d387989e..9fe0e8a877b5175a2a2584f2cb1e26c50d6fe4d5 100644 (file)
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -348,6 +348,8 @@ class pkgAcquire
     */
    bool Setup(pkgAcquireStatus *Progress = NULL, string const &Lock = "");
 
     */
    bool Setup(pkgAcquireStatus *Progress = NULL, string const &Lock = "");
 

+   void SetLog(pkgAcquireStatus *Progress) { Log = Progress; }
+

    /** \brief Construct a new pkgAcquire. */
    pkgAcquire(pkgAcquireStatus *Log) __deprecated;
    pkgAcquire();
    /** \brief Construct a new pkgAcquire. */
    pkgAcquire(pkgAcquireStatus *Log) __deprecated;
    pkgAcquire();

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 3292ae745ac4255688583ed2aec99ec5c3b4f146..748ebe6ab40bdce503fd652800496e57ad697b4a 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2366,8 +2366,7 @@ bool DoSource(CommandLine &CmdL)
    // Create the download object
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));   
    pkgAcquire Fetcher;
    // Create the download object
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));   
    pkgAcquire Fetcher;

-   if (Fetcher.Setup(&Stat) == false)
-      return false;
+   Fetcher.SetLog(&Stat);

 
    DscFile *Dsc = new DscFile[CmdL.FileSize()];
    
 
    DscFile *Dsc = new DscFile[CmdL.FileSize()];
    

diff --git a/debian/changelog b/debian/changelog
index a51a90b908da08c12bd649a60635bc1ef167e3ee..a834bca9191fb623e5c6d8fee6806dd1687a92dd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ apt (0.8.15.3) UNRELEASED; urgency=low
     - document APT::Architectures list (Closes: #612102)
   * cmdline/apt-get.cc:
     - restore all important dependencies for garbage packages (LP: #806274)
     - document APT::Architectures list (Closes: #612102)
   * cmdline/apt-get.cc:
     - restore all important dependencies for garbage packages (LP: #806274)

+    - do not require unused partial dirs in 'source' (Closes: #633510)

   * apt-pkg/init.cc:
     - use CndSet in pkgInitConfig (Closes: #629617)
   * apt-pkg/depcache.cc:
   * apt-pkg/init.cc:
     - use CndSet in pkgInitConfig (Closes: #629617)
   * apt-pkg/depcache.cc:


@@ -28,7 +29,7 @@ apt (0.8.15.3) UNRELEASED; urgency=low
   * doc/apt-cache.8.xml:
     - apply madison typofix from John Feuerstein, thanks! (Closes: #633455)
 
   * doc/apt-cache.8.xml:
     - apply madison typofix from John Feuerstein, thanks! (Closes: #633455)
 

- -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 16 Jul 2011 14:28:53 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 16 Jul 2011 14:55:03 +0200

 
 apt (0.8.15.2) unstable; urgency=high
 
 
 apt (0.8.15.2) unstable; urgency=high