From: David Kalnischkies Date: Wed, 15 Jul 2009 14:45:49 +0000 (+0200) Subject: merge with lp:~mvo/apt/debian-sid X-Git-Tag: 0.7.22~13^2~3 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/ef1dff93202fa61e0b8cda761906bbca31e217bc?hp=-c merge with lp:~mvo/apt/debian-sid --- ef1dff93202fa61e0b8cda761906bbca31e217bc diff --combined apt-pkg/cachefile.cc index f287a244c,5b5e26497..0b1efb9ff --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@@ -24,6 -24,7 +24,6 @@@ #include /*}}}*/ - // CacheFile::CacheFile - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ @@@ -91,7 -92,7 +91,7 @@@ bool pkgCacheFile::Open(OpProgress &Pro 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 @@@ -107,6 -108,8 +107,6 @@@ return true; } /*}}}*/ - - // CacheFile::Close - close the cache files /*{{{*/ // --------------------------------------------------------------------- /* */ diff --combined apt-pkg/policy.cc index e33d563a1,b9a951990..26d1c17bd --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@@ -32,6 -32,9 +32,9 @@@ #include + #include + #include + #include #include #include /*}}}*/ @@@ -120,14 -123,6 +123,14 @@@ pkgCache::VerIterator pkgPolicy::GetCan signed Max = GetPriority(Pkg); pkgCache::VerIterator Pref = GetMatch(Pkg); + // no package = no candidate version + if (Pkg.end() == true) + return Pref; + + // packages with a pin lower than 0 have no newer candidate than the current version + if (Max < 0) + return Pkg.CurrentVer(); + /* Falling through to the default version.. Setting Max to zero effectively excludes everything <= 0 which are the non-automatic priorities.. The status file is given a prio of 100 which will exclude @@@ -261,7 -256,52 +264,53 @@@ class PreferenceSection : public pkgTag Stop = (const char*) memchr(Stop,'\n',End-Stop); } }; - - + /*}}}*/ ++// ReadPinDir - Load the pin files from this dir into a Policy /*{{{*/ ++// --------------------------------------------------------------------- ++/* */ + 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 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); - } ++ ++ List.push_back(File); ++ } + closedir(D); - ++ + sort(List.begin(),List.end()); + + // Read the files + for (vector::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 /*{{{*/ // --------------------------------------------------------------------- /* I'd like to see the preferences file store more than just pin information @@@ -286,7 -326,7 +335,7 @@@ bool ReadPinFile(pkgPolicy &Plcy,strin { 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 --combined cmdline/apt-cache.cc index 93558fa88,acef8dc5e..57da9426f --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@@ -401,7 -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; @@@ -622,7 -622,7 +622,7 @@@ bool Depends(CommandLine &CmdL return true; } - + /*}}}*/ // RDepends - Print out a reverse dependency tree - mbc /*{{{*/ // --------------------------------------------------------------------- /* */ @@@ -710,7 -710,10 +710,7 @@@ bool RDepends(CommandLine &CmdL return true; } - /*}}}*/ - - // xvcg - Generate a graph for xvcg /*{{{*/ // --------------------------------------------------------------------- // Code contributed from Junichi Uekawa on 20 June 2002. @@@ -930,6 -933,8 +930,6 @@@ bool XVcg(CommandLine &CmdL return true; } /*}}}*/ - - // Dotty - Generate a graph for Dotty /*{{{*/ // --------------------------------------------------------------------- /* Dotty is the graphvis program for generating graphs. It is a fairly @@@ -1265,16 -1270,15 +1265,16 @@@ bool DisplayRecord(pkgCache::VerIterato return true; } /*}}}*/ -// Search - Perform a search /*{{{*/ -// --------------------------------------------------------------------- -/* This searches the package names and package descriptions for a pattern */ + struct ExDescFile { pkgCache::DescFile *Df; bool NameMatch; }; +// Search - Perform a search /*{{{*/ +// --------------------------------------------------------------------- +/* This searches the package names and package descriptions for a pattern */ bool Search(CommandLine &CmdL) { pkgCache &Cache = *GCache; @@@ -1511,7 -1515,7 +1511,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 @@@ -1687,6 -1691,7 +1687,6 @@@ bool Madison(CommandLine &CmdL return true; } - /*}}}*/ // GenCaches - Call the main cache generator /*{{{*/ // --------------------------------------------------------------------- @@@ -1760,7 -1765,8 +1760,7 @@@ void CacheInitialize( _config->Set("help",false); } /*}}}*/ - -int main(int argc,const char *argv[]) +int main(int argc,const char *argv[]) /*{{{*/ { CommandLine::Args Args[] = { {'h',"help","help",0}, @@@ -1867,4 -1873,3 +1867,4 @@@ return 0; } + /*}}}*/ diff --combined debian/changelog index aba5e4cf4,7f14502e7..786b8a86f --- a/debian/changelog +++ b/debian/changelog @@@ -13,9 -13,10 +13,10 @@@ apt (0.7.22) UNRELEASED; urgency=lo - fr.po - it.po. Closes: #531758 - ca.po. Closes: #531921 + - de.po. Closes: #536430 * Added translations - ast.po (Asturian by Marcos Alvareez Costales). - Closes: #529007, #529730 + Closes: #529007, #529730, #535328 [ David Kalnischkies ] * [ABI break] support '#' in apt.conf and /etc/apt/preferences @@@ -29,25 -30,26 +30,31 @@@ * add Debug::pkgProblemResolver::ShowScores and make the scores adjustable * do not write state file in simulate mode (closes: #433007) - * add hook for auto-install (closes: #470035) - * support IsAutoInstallOk in the resolver too + * add hook for MarkInstall and MarkDelete (closes: #470035) * fix typo in apt-pkg/acquire.cc which prevents Dl-Limit to work correctly when downloading from multiple sites (Closes: #534752) + * add the various foldmarkers in apt-pkg & cmdline (no code change) + * versions with a pin of -1 shouldn't be a candidate (Closes: #355237) + * prefer mmap as memory allocator in MMap instead of a static char + array which can (at least in theory) grow dynamic + * add a segfault handler to MMap to show the Cache-Limit message, which + can be deactivated with MMap::SegfaultHandler=false (Closes: 535218) [ Michael Vogt ] - * honor the dpkg hold state in AutoInstOk (closes: #64141) + * honor the dpkg hold state in new Marker hooks (closes: #64141) - + * debian/apt.cron.daily: + - if the timestamp is too far in the future, delete it - ++ [ Julian Andres Klode ] * 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, by adding ReadPinDir() (Closes: #535512) + * configure-index: document Dir::Etc::SourceParts and some other options + (Closes: #459605) + * Remove Eugene V. Lyubimkin from uploaders as requested. - -- Christian Perrier Wed, 22 Apr 2009 10:13:54 +0200 + -- Julian Andres Klode Fri, 03 Jul 2009 08:27:35 +0200 apt (0.7.21) unstable; urgency=low diff --combined doc/examples/configure-index index ce56f1563,c2b1bb272..2045ca1f3 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@@ -55,7 -55,6 +55,7 @@@ AP Diff-Only "false"; Tar-Only "false"; Build-Dep-Automatic "true"; + Show-User-Simulation-Note "true"; }; Cache @@@ -220,10 -219,14 +220,14 @@@ Dir "/ // Config files Etc "etc/apt/" { - SourceList "sources.list"; Main "apt.conf"; - Preferences "preferences"; Parts "apt.conf.d/"; + Preferences "preferences"; + PreferencesParts "preferences.d"; + SourceList "sources.list"; + SourceParts "sources.list.d"; + VendorList "vendors.list"; + VendorParts "vendors.list.d"; }; // Locations of binaries