From 37f45a579d4344c3ef6a044b12b992353e238301 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Wed, 11 Dec 2013 09:21:26 +0100
Subject: improve error message for apt-get source pkg:arch{=ver,/release}

---
 cmdline/apt-get.cc | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'cmdline')

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 9cc5b4031..c2b59a83c 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -269,15 +269,15 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
 		  break;
 	    }
 
+            // ignore arches that are not for us
+            if (ArchTag != "" && Ver.Arch() != ArchTag)
+               continue;
+
             // pick highest version for the arch unless the user wants
             // something else
             if (ArchTag != "" && VerTag == "" && RelTag == "")
-            {
-               if(Ver.Arch() != ArchTag)
-                  continue;
                if(Cache->VS().CmpVersion(VerTag, Ver.VerStr()) < 0)
                   VerTag = Ver.VerStr();
-            }
 
 	    // We match against a concrete version (or a part of this version)
 	    if (VerTag.empty() == false &&
@@ -320,6 +320,16 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
 	 }
       }
 
+      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());
+         Src = Name;
+         return 0;
+      }
+
+
       if (Src.empty() == true)
       {
 	 // if we don't have found a fitting package yet so we will
-- 
cgit v1.2.3