merged from mvo

[apt.git] / cmdline / apt-extracttemplates.cc

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 60ec3c3fd3476bdcc0ae99bceadc3ef5095713f2..de22386b9fbefc696678c084d2a779846feae874 100644 (file)
--- 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.6 2001/03/03 23:02:39 tausq Exp $
+// $Id: apt-extracttemplates.cc,v 1.15 2003/07/26 00:00:11 mdz Exp $
 /* ######################################################################
    
    APT Extract Templates - Program to extract debconf config and template
@@ -35,11 +35,14 @@
 #include <unistd.h>
 #include <fstream>
 
+#include <locale.h>
 #include <config.h>
 #include <apti18n.h>
 #include "apt-extracttemplates.h"
                                                                        /*}}}*/
 
+using namespace std;
+
 #define TMPDIR         "/tmp"
 
 pkgCache *DebFile::Cache = 0;
@@ -96,7 +99,7 @@ bool DebFile::Go()
        
        if (File.Seek(Member->Start) == false)
                return false;
-       ExtractTar Tar(File, Member->Size);
+       ExtractTar Tar(File, Member->Size,"gzip");
        return Tar.Go(*this);
 }
                                                                        /*}}}*/
@@ -219,8 +222,8 @@ bool DebFile::ParseInfo()
 /* */
 int ShowHelp(void)
 {
-       ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
-           COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+       ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+           COMMON_ARCH,__DATE__,__TIME__);
 
        if (_config->FindB("version") == true) 
                return 0;
@@ -235,18 +238,26 @@ int ShowHelp(void)
                "  -h   This help text\n"
                "  -t   Set the temp dir\n"
                "  -c=? Read this configuration file\n"
-               "  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n");
+               "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");
        return 0;
 }
                                                                        /*}}}*/
 // WriteFile - write the contents of the passed string to a file       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-string WriteFile(const char *prefix, const char *data)
+string WriteFile(const char *package, const char *prefix, const char *data)
 {
        char fn[512];
        static int i;
-       snprintf(fn, sizeof(fn), "%s/%s.%u%d", _config->Find("APT::ExtractTemplates::TempDir", TMPDIR).c_str(), prefix, getpid(), i++);
+       const char *tempdir = NULL;
+
+        tempdir = getenv("TMPDIR");
+        if (tempdir == NULL)
+             tempdir = TMPDIR;
+
+       snprintf(fn, sizeof(fn), "%s/%s.%s.%u%d",
+                 _config->Find("APT::ExtractTemplates::TempDir", tempdir).c_str(),
+                 package, prefix, getpid(), i++);
        FileFd f;
        if (data == NULL)
                data = "";
@@ -267,8 +278,8 @@ string WriteFile(const char *prefix, const char *data)
 /* */
 void WriteConfig(const DebFile &file)
 {
-       string templatefile = WriteFile("template", file.Template);
-       string configscript = WriteFile("config", file.Config);
+       string templatefile = WriteFile(file.Package.c_str(), "template", file.Template);
+       string configscript = WriteFile(file.Package.c_str(), "config", file.Config);
 
        if (templatefile.empty() == true || configscript.empty() == true)
                return;
@@ -287,6 +298,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;
@@ -302,20 +315,26 @@ 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)
                {
                        // Check to make sure debconf dependencies are
                        // satisfied
+                       // cout << "Check " << file.DepVer << ',' << debconfver << endl;
                        if (file.DepVer != "" &&
-                           DebFile::Cache->VS->CheckDep(file.DepVer.c_str(),
-                                       file.DepOp, debconfver.c_str()) == false)
+                           DebFile::Cache->VS->CheckDep(debconfver.c_str(),
+                                       file.DepOp,file.DepVer.c_str()
+                                                        ) == false)
                                continue;
                        if (file.PreDepVer != "" &&
-                           DebFile::Cache->VS->CheckDep(file.PreDepVer.c_str(), 
-                                       file.PreDepOp, debconfver.c_str()) == false) 
+                           DebFile::Cache->VS->CheckDep(debconfver.c_str(),
+                                       file.PreDepOp,file.PreDepVer.c_str()
+                                                        ) == false) 
                                continue;
 
                        WriteConfig(file);
@@ -339,7 +358,11 @@ int main(int argc, const char **argv)
                {'c',"config-file",0,CommandLine::ConfigFile},
                {'o',"option",0,CommandLine::ArbItem},
                {0,0,0,0}};
-       
+
+       // Set up gettext support
+       setlocale(LC_ALL,"");
+       textdomain(PACKAGE);
+
        // Parse the command line and initialize the package library
        CommandLine CmdL(Args,_config);
        if (pkgInitConfig(*_config) == false ||