diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2012-12-26 23:52:47 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2012-12-26 23:52:47 +0100 |
| commit | d2cca6ec46865a1f5167f846e67150dc19ca2022 (patch) | |
| tree | 43d335f69870a72b97fa41a1b208784b8753d354 /apt-pkg/edsp | |
| parent | 7735ad0500b6fefef03b2a3dc2a6843e82353e94 (diff) | |
| parent | d663a4c8a8723ae4936d10d0a98ea2c05a29cbc4 (diff) | |
merged from the debian-sid branch
Diffstat (limited to 'apt-pkg/edsp')
| -rw-r--r-- | apt-pkg/edsp/edspindexfile.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/edsp/edspsystem.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc index 482581979..98ce4497a 100644 --- a/apt-pkg/edsp/edspindexfile.cc +++ b/apt-pkg/edsp/edspindexfile.cc @@ -51,7 +51,8 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const pkgCache::PkgFileIterator CFile = Gen.GetCurFile(); CFile->Size = Pkg.FileSize(); CFile->mtime = Pkg.ModificationTime(); - CFile->Archive = Gen.WriteUniqString("edsp::scenario"); + map_ptrloc const storage = Gen.WriteUniqString("edsp::scenario"); + CFile->Archive = storage; if (Gen.MergeList(Parser) == false) return _error->Error("Problem with MergeList %s",File.c_str()); 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; } |