From: Michael Vogt <mvo@debian.org>
Date: Thu, 12 Dec 2013 17:32:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'mvo/bugfix/conffile' into debian/sid
X-Git-Tag: 0.9.14.2~11
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/3ab9b6c0e9209d3d14f136c7a703c873fa8f14df?ds=inline;hp=-c

Merge remote-tracking branch 'mvo/bugfix/conffile' into debian/sid
---

3ab9b6c0e9209d3d14f136c7a703c873fa8f14df
diff --combined cmdline/apt-get.cc
index 0b980cdf4,6973901dc..730d3ea18
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -322,12 -322,9 +322,12 @@@ pkgSrcRecords::Parser *FindSrc(const ch
  
        if (Src == "" && ArchTag != "")
        {
 -          _error->Error(_("Can not find a package '%s' with version '%s' and "
 -                          "release '%s'"), Pkg.FullName().c_str(), 
 -                                           VerTag.c_str(), RelTag.c_str());
 +         if (VerTag != "")
 +            _error->Error(_("Can not find a package '%s' with version '%s'"),
 +                          Pkg.FullName().c_str(), VerTag.c_str());
 +         if (RelTag != "")
 +            _error->Error(_("Can not find a package '%s' with release '%s'"),
 +                          Pkg.FullName().c_str(), RelTag.c_str());
           Src = Name;
           return 0;
        }
@@@ -419,7 -416,7 +419,7 @@@
  
        if (Last != 0 || VerTag.empty() == true)
  	 break;
-       _error->Error(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
+       _error->Error(_("Can not find version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
        return 0;
     }