summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/cachefile.cc2
-rw-r--r--apt-pkg/init.cc1
-rw-r--r--apt-pkg/policy.cc50
-rw-r--r--apt-pkg/policy.h1
-rw-r--r--cmdline/apt-cache.cc4
-rw-r--r--debian/apt.dirs1
-rw-r--r--debian/changelog3
7 files changed, 57 insertions, 5 deletions
diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index 1a84aea54..5b5e26497 100644
--- a/apt-pkg/cachefile.cc
+++ b/apt-pkg/cachefile.cc
@@ -92,7 +92,7 @@ bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock)
Policy = new pkgPolicy(Cache);
if (_error->PendingError() == true)
return false;
- if (ReadPinFile(*Policy) == false)
+ if (ReadPinFile(*Policy) == false || ReadPinDir(*Policy) == false)
return false;
// Create the dependency cache
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 338bef66c..4abfb726f 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -67,6 +67,7 @@ bool pkgInitConfig(Configuration &Cnf)
Cnf.Set("Dir::Etc::main","apt.conf");
Cnf.Set("Dir::Etc::parts","apt.conf.d");
Cnf.Set("Dir::Etc::preferences","preferences");
+ Cnf.Set("Dir::Etc::preferencesparts","preferences.d");
Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
// State
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 98576fc91..b9a951990 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -32,6 +32,9 @@
#include <apti18n.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <algorithm>
#include <iostream>
#include <sstream>
/*}}}*/
@@ -253,6 +256,51 @@ class PreferenceSection : public pkgTagSection
Stop = (const char*) memchr(Stop,'\n',End-Stop);
}
};
+
+
+bool ReadPinDir(pkgPolicy &Plcy,string Dir)
+{
+ if (Dir.empty() == true)
+ Dir = _config->FindDir("Dir::Etc::PreferencesParts");
+
+ DIR *D = opendir(Dir.c_str());
+ if (D == 0)
+ return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
+
+ vector<string> List;
+
+ for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D))
+ {
+ if (Ent->d_name[0] == '.')
+ continue;
+
+ // Skip bad file names ala run-parts
+ const char *C = Ent->d_name;
+ for (; *C != 0; C++)
+ if (isalpha(*C) == 0 && isdigit(*C) == 0 && *C != '_' && *C != '-')
+ break;
+ if (*C != 0)
+ continue;
+
+ // Make sure it is a file and not something else
+ string File = flCombine(Dir,Ent->d_name);
+ struct stat St;
+ if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0)
+ continue;
+
+ List.push_back(File);
+ }
+ closedir(D);
+
+ sort(List.begin(),List.end());
+
+ // Read the files
+ for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++)
+ if (ReadPinFile(Plcy, *I) == false)
+ return false;
+ return true;
+}
+
/*}}}*/
// ReadPinFile - Load the pin file into a Policy /*{{{*/
// ---------------------------------------------------------------------
@@ -278,7 +326,7 @@ bool ReadPinFile(pkgPolicy &Plcy,string File)
{
string Name = Tags.FindS("Package");
if (Name.empty() == true)
- return _error->Error(_("Invalid record in the preferences file, no Package header"));
+ return _error->Error(_("Invalid record in the preferences file %s, no Package header"), File.c_str());
if (Name == "*")
Name = string();
diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index d5f3b2f75..4894682fa 100644
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -84,5 +84,6 @@ class pkgPolicy : public pkgDepCache::Policy
};
bool ReadPinFile(pkgPolicy &Plcy,string File = "");
+bool ReadPinDir(pkgPolicy &Plcy,string Dir = "");
#endif
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 4431fd4f9..acef8dc5e 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -401,7 +401,7 @@ bool DumpAvail(CommandLine &Cmd)
pkgCache &Cache = *GCache;
pkgPolicy Plcy(&Cache);
- if (ReadPinFile(Plcy) == false)
+ if (ReadPinFile(Plcy) == false || ReadPinDir(Plcy) == false)
return false;
unsigned long Count = Cache.HeaderP->PackageCount+1;
@@ -1515,7 +1515,7 @@ bool Policy(CommandLine &CmdL)
pkgCache &Cache = *GCache;
pkgPolicy Plcy(&Cache);
- if (ReadPinFile(Plcy) == false)
+ if (ReadPinFile(Plcy) == false || ReadPinDir(Plcy) == false)
return false;
// Print out all of the package files
diff --git a/debian/apt.dirs b/debian/apt.dirs
index 47f60e7e3..fb6716c35 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -3,6 +3,7 @@ usr/lib/apt/methods
usr/lib/dpkg/methods/apt
etc/apt
etc/apt/apt.conf.d
+etc/apt/preferences.d
etc/apt/sources.list.d
etc/logrotate.d
var/cache/apt/archives/partial
diff --git a/debian/changelog b/debian/changelog
index 668192967..9024f687d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,8 +41,9 @@ apt (0.7.22) UNRELEASED; urgency=low
* apt-pkg/contrib/configuration.cc: Fix a small memory leak in
ReadConfigFile.
* Introduce support for the Enhances field. (Closes: #137583)
+ * Support /etc/apt/preferences.d (Closes: #535512)
- -- Christian Perrier <bubulle@debian.org> Wed, 22 Apr 2009 10:13:54 +0200
+ -- Julian Andres Klode <jak@debian.org> Fri, 03 Jul 2009 08:27:35 +0200
apt (0.7.21) unstable; urgency=low