From 08945efa9545add65ee6709e55d9fc9bf40bac65 Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:59:28 +0000
Subject: Don't segfault if the cache can't be made. Author: jgg Date:
 2002-09-21 21:29:13 GMT Don't segfault if the cache can't be made. Show the
 filename for all error messages that are due to opening .debs #151835

---
 cmdline/apt-extracttemplates.cc | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'cmdline/apt-extracttemplates.cc')

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 700cf1871..d77057786 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: apt-extracttemplates.cc,v 1.10 2002/02/25 03:52:58 tausq Exp $
+// $Id: apt-extracttemplates.cc,v 1.11 2002/09/21 21:29:13 jgg Exp $
 /* ######################################################################
    
    APT Extract Templates - Program to extract debconf config and template
@@ -288,6 +288,8 @@ bool Go(CommandLine &CmdL)
 	List.ReadMainList();
 	OpProgress Prog;
 	pkgMakeStatusCache(List,Prog,&Map,true);
+	if (Map == 0)
+	   return false;
 	DebFile::Cache = new pkgCache(Map);
 	if (_error->PendingError() == true)
 		return false;
@@ -303,8 +305,11 @@ bool Go(CommandLine &CmdL)
 		// Will pick up the errors later..
 		DebFile file(CmdL.FileList[I]);
 		if (file.Go() == false)
-			continue; 
-		
+		{
+		        _error->Error("Prior errors apply to %s",CmdL.FileList[I]);
+			continue;
+		}
+
 		// Does the package have templates?
 		if (file.Template != 0 && file.ParseInfo() == true)
 		{
-- 
cgit v1.2.3