summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-07-16 14:57:37 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-07-16 14:57:37 +0200
commit4a53151acad0c4ccfbcf4ce11c5c2d7cffd05de3 (patch)
tree46ec7198560370e03f3218ab2aaabc4ad9e0fbe1
parent22eeef1809dae0594eca961783b1f809f4d539f7 (diff)
do not require unused partial dirs in 'source' (Closes: #633510)
-rw-r--r--apt-pkg/acquire.h2
-rw-r--r--cmdline/apt-get.cc3
-rw-r--r--debian/changelog3
3 files changed, 5 insertions, 3 deletions
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index e3a4435b8..9fe0e8a87 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -348,6 +348,8 @@ class pkgAcquire
*/
bool Setup(pkgAcquireStatus *Progress = NULL, string const &Lock = "");
+ void SetLog(pkgAcquireStatus *Progress) { Log = Progress; }
+
/** \brief Construct a new pkgAcquire. */
pkgAcquire(pkgAcquireStatus *Log) __deprecated;
pkgAcquire();
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 3292ae745..748ebe6ab 100644
--- 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;
- if (Fetcher.Setup(&Stat) == false)
- return false;
+ Fetcher.SetLog(&Stat);
DscFile *Dsc = new DscFile[CmdL.FileSize()];
diff --git a/debian/changelog b/debian/changelog
index a51a90b90..a834bca91 100644
--- 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)
+ - do not require unused partial dirs in 'source' (Closes: #633510)
* 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)
- -- 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