summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-11-22 18:59:28 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-11-22 18:59:28 +0100
commit82c8f08ec6f2e1ae03ae4598ded13a204f9d272f (patch)
tree8e9bd3bc5c5f25595b1c746a6dc836d6c7c78c4b
parentbaf685fd1dda8e154aed454544d838ed93ef5be4 (diff)
* apt-pkg/cdrom.cc:
- use aptconfiguration to get the supported compression types
-rw-r--r--apt-pkg/cdrom.cc83
-rw-r--r--debian/changelog5
2 files changed, 59 insertions, 29 deletions
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index d1bc1f3ba..07983e44f 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -78,27 +78,43 @@ bool pkgCdrom::FindPackages(string CD,
{
SigList.push_back(CD);
}
+
/* Aha! We found some package files. We assume that everything under
this dir is controlled by those package files so we don't look down
anymore */
- if (stat("Packages",&Buf) == 0 || stat("Packages.gz",&Buf) == 0 ||
- stat("Packages.bz2",&Buf) == 0 || stat("Packages.xz",&Buf) == 0)
- {
- List.push_back(CD);
+ std::vector<std::string> types = APT::Configuration::getCompressionTypes();
+ types.push_back("");
+ for (std::vector<std::string>::const_iterator t = types.begin();
+ t != types.end(); ++t)
+ {
+ std::string filename = std::string("Packages");
+ if ((*t).size() > 0)
+ filename.append("."+*t);
+ if (stat(filename.c_str(), &Buf) == 0)
+ {
+ List.push_back(CD);
- // Continue down if thorough is given
- if (_config->FindB("APT::CDROM::Thorough",false) == false)
- return true;
- }
- if (stat("Sources.xz",&Buf) == 0 || stat("Sources.bz2",&Buf) == 0 ||
- stat("Sources.gz",&Buf) == 0 || stat("Sources",&Buf) == 0)
- {
- SList.push_back(CD);
+ // Continue down if thorough is given
+ if (_config->FindB("APT::CDROM::Thorough",false) == false)
+ return true;
+ break;
+ }
+ }
+ for (std::vector<std::string>::const_iterator t = types.begin();
+ t != types.end(); ++t)
+ {
+ std::string filename = std::string("Sources");
+ if ((*t).size() > 0)
+ filename.append("."+*t);
+ {
+ SList.push_back(CD);
- // Continue down if thorough is given
- if (_config->FindB("APT::CDROM::Thorough",false) == false)
- return true;
- }
+ // Continue down if thorough is given
+ if (_config->FindB("APT::CDROM::Thorough",false) == false)
+ return true;
+ break;
+ }
+ }
// see if we find translatin indexes
if (stat("i18n",&Buf) == 0)
@@ -111,12 +127,15 @@ bool pkgCdrom::FindPackages(string CD,
if (_config->FindB("Debug::aptcdrom",false) == true)
std::clog << "found translations: " << Dir->d_name << "\n";
string file = Dir->d_name;
- if(file.substr(file.size()-3,file.size()) == ".gz" ||
- file.substr(file.size()-3,file.size()) == ".xz")
- file = file.substr(0,file.size()-3);
- if(file.substr(file.size()-4,file.size()) == ".bz2")
- file = file.substr(0,file.size()-4);
- TransList.push_back(CD+"i18n/"+ file);
+ for (std::vector<std::string>::const_iterator t = types.begin();
+ t != types.end(); ++t)
+ {
+ std::string needle = "." + *t;
+ if(file.substr(file.size()-needle.size()) == needle)
+ file = file.substr(0, file.size()-needle.size());
+ TransList.push_back(CD+"i18n/"+ file);
+ break;
+ }
}
}
closedir(D);
@@ -262,13 +281,19 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
for (unsigned int I = 0; I != List.size(); I++)
{
struct stat Buf;
- if (stat((List[I] + Name).c_str(),&Buf) != 0 &&
- stat((List[I] + Name + ".gz").c_str(),&Buf) != 0 &&
- stat((List[I] + Name + ".bz2").c_str(),&Buf) != 0 &&
- stat((List[I] + Name + ".xz").c_str(),&Buf) != 0)
- _error->Errno("stat","Failed to stat %s%s",List[I].c_str(),
- Name);
- Inodes[I] = Buf.st_ino;
+ std::vector<std::string> types = APT::Configuration::getCompressionTypes();
+ types.push_back("");
+ for (std::vector<std::string>::const_iterator t = types.begin();
+ t != types.end(); ++t)
+ {
+ std::string filename = List[I] + Name;
+ if ((*t).size() > 0)
+ filename.append("." + *t);
+ if (stat(filename.c_str(), &Buf) != 0)
+ _error->Errno("stat","Failed to stat %s%s",List[I].c_str(),
+ Name);
+ Inodes[I] = Buf.st_ino;
+ }
}
if (_error->PendingError() == true) {
diff --git a/debian/changelog b/debian/changelog
index fab547fc8..2d37c0677 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
apt (0.8.16~exp9) UNRELEASED; urgency=low
+ [ Julian Andres Klode ]
* apt-pkg/cdrom.cc:
- Accept .bz2, .xz files in addition to .gz files (Closes: #649451)
+
+ [ Michael Vogt ]
+ * apt-pkg/cdrom.cc:
+ - use aptconfiguration to get the supported compression types
-- Julian Andres Klode <jak@debian.org> Mon, 21 Nov 2011 18:46:36 +0100