summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-06-09 16:11:15 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2009-06-09 16:11:15 +0200
commitaa16679ccb39598b9b4546c912af1cf8c70e529b (patch)
tree996f5916d12bed8fa3464405bf8090aa3b864354 /apt-pkg
parente729233f0c20656bf41f8254d03160191e2f4d81 (diff)
parenteac9121ea9d2b4180399f4b63f88491f8e0f1a8a (diff)
merged from the debian-sid branch
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire.h2
-rw-r--r--apt-pkg/contrib/configuration.cc4
-rw-r--r--apt-pkg/deb/debsystem.cc1
3 files changed, 3 insertions, 4 deletions
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 1de6f5e44..eaadded55 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -539,7 +539,7 @@ class pkgAcquire::UriIterator
public:
- inline void operator ++() {operator ++();};
+ inline void operator ++() {operator ++(0);};
void operator ++(int)
{
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 7326b84ea..a82311a3f 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -182,9 +182,9 @@ string Configuration::FindFile(const char *Name,const char *Default) const
if (Itm == 0 || Itm->Value.empty() == true)
{
if (Default == 0)
- return "";
+ return rootDir;
else
- return Default;
+ return rootDir + Default;
}
string val = Itm->Value;
diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index 186918d25..089a465c1 100644
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -18,7 +18,6 @@
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
#include <apti18n.h>
-
#include <sys/types.h>
#include <unistd.h>
#include <dirent.h>