From da543ed87d3f8b8a0030a211452c9bddfc066f0b Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Sun, 16 Dec 2007 18:35:58 -0200
Subject: * Applied patch from Peter Eisentraut <peter_e@gmx.net> to fix a
grammatical error ("manual installed" -> "manually installed"), closes:
#438136. *
---
apt-pkg/algorithms.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'apt-pkg')
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 62727a852..158f9c258 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1261,8 +1261,8 @@ void pkgProblemResolver::InstallProtect()
Cache.MarkDelete(I);
else
{
- // preserver the information if the package was auto
- // or manual installed
+ // preserve the information whether the package was auto
+ // or manually installed
bool autoInst = (Cache[I].Flags & pkgCache::Flag::Auto);
Cache.MarkInstall(I, false, 0, !autoInst);
}
--
cgit v1.2.3
From db2cca1129fa2d88eae80e1c4a17e263236a95a3 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Sun, 16 Dec 2007 18:53:32 -0200
Subject: * apt-pkg/contrib/configuration.cc: - if RootDir is set, then
FindFile and FindDir will return paths relative to the directory stored
in RootDir, closes: #456457.
---
apt-pkg/contrib/configuration.cc | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
(limited to 'apt-pkg')
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 3109fd7a5..e8301d918 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -173,6 +173,11 @@ string Configuration::Find(const char *Name,const char *Default) const
*/
string Configuration::FindFile(const char *Name,const char *Default) const
{
+ const Item *RootItem = Lookup("RootDir");
+ std::string rootDir = (RootItem == 0) ? "" : RootItem->Value;
+ if(rootDir.size() > 0 && rootDir[rootDir.size() - 1] != '/')
+ rootDir.push_back('/');
+
const Item *Itm = Lookup(Name);
if (Itm == 0 || Itm->Value.empty() == true)
{
@@ -204,7 +209,7 @@ string Configuration::FindFile(const char *Name,const char *Default) const
Itm = Itm->Parent;
}
- return val;
+ return rootDir + val;
}
/*}}}*/
// Configuration::FindDir - Find a directory name /*{{{*/
--
cgit v1.2.3