use a less generic special trigger filename for stdin

Git-Dch: Ignore

diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
index 409117c5ef8c93c060f40d128f77a511f8752e74..4e0f9c26a99c088afb12ad96bbd50d78e24c28c0 100644 (file)
--- a/apt-pkg/edsp/edspindexfile.cc
+++ b/apt-pkg/edsp/edspindexfile.cc
@@ -47,7 +47,7 @@ uint8_t edspIndex::GetIndexFlags() const
 }
 bool edspIndex::OpenListFile(FileFd &Pkg, std::string const &FileName)
 {
-   if (FileName.empty() == false && FileName != "stdin")
+   if (FileName.empty() == false && FileName != "/nonexistent/stdin")
       return pkgDebianIndexRealFile::OpenListFile(Pkg, FileName);
    if (Pkg.OpenDescriptor(STDIN_FILENO, FileFd::ReadOnly) == false)
       return _error->Error("Problem opening %s",FileName.c_str());

diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc
index c52d537f34ca3ad10899397f6b3abc379ac20abf..4c16f76d2f8c53cd10a3f77af574e50a5931d553 100644 (file)
--- a/apt-pkg/edsp/edspsystem.cc
+++ b/apt-pkg/edsp/edspsystem.cc
@@ -131,8 +131,8 @@ bool edspSystem::AddStatusFiles(std::vector<pkgIndexFile *> &List)  /*{{{*/
 {
    if (StatusFile == 0)
    {
-      if (_config->Find("edsp::scenario", "") == "stdin")
-        StatusFile = new edspIndex("stdin");
+      if (_config->Find("edsp::scenario", "") == "/nonexistent/stdin")
+        StatusFile = new edspIndex("/nonexistent/stdin");
       else
         StatusFile = new edspIndex(_config->FindFile("edsp::scenario"));
    }

diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index db57faf07db852b3e6e2ef2d67162d337305be68..c3c0e74ae27bf5ef4db2b079db1f4d2aa3f62cdd 100644 (file)
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -267,9 +267,13 @@ std::string pkgDebianIndexTargetFile::GetProgressDescription() const
    return Target.Description;
 }
 
-pkgDebianIndexRealFile::pkgDebianIndexRealFile(std::string const &File, bool const Trusted) :/*{{{*/
-   pkgDebianIndexFile(Trusted), d(NULL), File(flAbsPath(File))
+pkgDebianIndexRealFile::pkgDebianIndexRealFile(std::string const &pFile, bool const Trusted) :/*{{{*/
+   pkgDebianIndexFile(Trusted), d(NULL)
 {
+   if (pFile == "/nonexistent/stdin")
+      File = pFile;
+   else
+      File = flAbsPath(pFile);
 }
                                                                        /*}}}*/
 // IndexRealFile::Size - Return the size of the index                  /*{{{*/

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index af301dbcd7dd0201e7d5478a43cb8ff07c3a7f74..258b42ccb73f7b9d5efe4d7526a3f64b4f793ce2 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -111,7 +111,7 @@ int main(int argc,const char *argv[])                                       /*{{{*/
 
        _config->Set("APT::System", "Debian APT solver interface");
        _config->Set("APT::Solver", "internal");
-       _config->Set("edsp::scenario", "stdin");
+       _config->Set("edsp::scenario", "/nonexistent/stdin");
        int input = STDIN_FILENO;
        FILE* output = stdout;
        SetNonBlock(input, false);