summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-09-07 15:15:23 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-09-07 15:15:23 +0200
commitc05e4d78eed3ae5ba5c4df7fcd2b2b200ff800a5 (patch)
tree6f25ea392c137458331dea630fb15a535d8d6b7c
parent23bd97d4e1e509efef4fbda49036c8ac36c6d5d4 (diff)
parent2db5b414b2181ae1af65e0d346f7604ff53f051c (diff)
merged from lp:~donkult/apt/sid
-rw-r--r--debian/changelog12
-rw-r--r--ftparchive/apt-ftparchive.cc7
2 files changed, 15 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 3a17d7f58..99a972031 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,20 @@
apt (0.8.3) UNRELEASED; urgency=low
+ [ Manpages translations ]
+ * Japanese (KURASAWA Nozomu). Closes: #595862
+
+ [ Michael Vogt ]
* apt-pkg/indexcopy.cc:
- only use trusted.gpg.d directory if it exists
- do not replace /dev/null when running in APT::CDROM::NoAct
mode (LP: #612666), thanks to Colin Watson
- [ Manpages translations ]
- * Japanese (KURASAWA Nozomu). Closes: #595862
+ [ David Kalnischkies ]
+ * ftparchive/apt-ftparchive.cc:
+ - ensure that BinDirectory as well as Tree settings get
+ the correct default FileMode setting (Closes: #595922)
- -- Michael Vogt <mvo@debian.org> Tue, 07 Sep 2010 10:02:02 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com> Tue, 07 Sep 2010 15:07:59 +0200
apt (0.8.2) unstable; urgency=low
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index 6f9fa7ab3..73d34249b 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -135,6 +135,8 @@ void PackageMap::GetGeneral(Configuration &Setup,Configuration &Block)
PkgExt = Block.Find("Packages::Extensions",
Setup.Find("Default::Packages::Extensions",".deb").c_str());
+ Permissions = Setup.FindI("Default::FileMode",0644);
+
if (FLFile.empty() == false)
FLFile = flCombine(Setup.Find("Dir::FileListDir"),FLFile);
@@ -457,7 +459,7 @@ void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup)
string DFLFile = Setup.Find("TreeDefault::FileList", "");
string DSFLFile = Setup.Find("TreeDefault::SourceFileList", "");
- int const Permissions = Setup.FindI("Default::FileMode",0644);
+ mode_t const Permissions = Setup.FindI("Default::FileMode",0644);
bool const LongDescription = Setup.FindB("Default::LongDescription",
_config->FindB("APT::FTPArchive::LongDescription", true));
@@ -548,6 +550,8 @@ void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup)
/* */
void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
{
+ mode_t const Permissions = Setup.FindI("Default::FileMode",0644);
+
// Process 'bindirectory' type sections
const Configuration::Item *Top = Setup.Tree("bindirectory");
for (Top = (Top == 0?0:Top->Child); Top != 0;)
@@ -567,6 +571,7 @@ void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
Itm.InternalPrefix = Block.Find("InternalPrefix",Top->Tag.c_str());
Itm.Contents = Block.Find("Contents");
Itm.ContentsHead = Block.Find("Contents::Header");
+ Itm.Permissions = Block.FindI("FileMode", Permissions);
Itm.GetGeneral(Setup,Block);
PkgList.push_back(Itm);