summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/edsp/edspsystem.cc2
-rw-r--r--debian/changelog5
2 files changed, 5 insertions, 2 deletions
diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc
index 6b9207451..aae969d9d 100644
--- a/apt-pkg/edsp/edspsystem.cc
+++ b/apt-pkg/edsp/edspsystem.cc
@@ -91,7 +91,7 @@ signed edspSystem::Score(Configuration const &Cnf)
{
if (Cnf.Find("edsp::scenario", "") == "stdin")
return 1000;
- if (FileExists(Cnf.FindFile("edsp::scenario","")) == true)
+ if (RealFileExists(Cnf.FindFile("edsp::scenario","")) == true)
return 1000;
return -1000;
}
diff --git a/debian/changelog b/debian/changelog
index e585530ff..27747e23f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,11 @@ apt (0.9.3) unstable; urgency=low
- clearly separate 'positive' and 'negative' dependencies and
their upgrade-resolution tries in MarkInstall and especially don't
treat Conflicts differently compared to Breaks here
+ * edsp/edspsystem.cc:
+ - check with RealFileExists for scenario file as otherwise a directory
+ like one provided with RootDir triggers the usage of EDSP
- -- David Kalnischkies <kalnischkies@gmail.com> Mon, 23 Apr 2012 17:43:53 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com> Mon, 23 Apr 2012 18:23:10 +0200
apt (0.9.2) unstable; urgency=low