* Patch from Otavio Salvador to switch from dh_installm...

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

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 0f7242e9851e4a5b236ea01aaffcc3bf26ca9132..eecb7fe2f4003bf500e5e3f4e0c37cd0d25de3fb 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-extracttemplates.cc,v 1.4 2001/02/27 04:26:03 jgg 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
 /* ######################################################################
    
    APT Extract Templates - Program to extract debconf config and template


@@ -27,6 +27,7 @@
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>

+#include <apt-pkg/fileutl.h>

        
 #include <stdio.h>
 #include <string.h>
        
 #include <stdio.h>
 #include <string.h>


@@ -34,12 +35,15 @@
 #include <unistd.h>
 #include <fstream>
 
 #include <unistd.h>
 #include <fstream>
 

+#include <locale.h>

 #include <config.h>
 #include <apti18n.h>
 #include "apt-extracttemplates.h"
                                                                        /*}}}*/
 
 #include <config.h>
 #include <apti18n.h>
 #include "apt-extracttemplates.h"
                                                                        /*}}}*/
 

-#define TMPDIR         "/var/lib/debconf/"
+using namespace std;
+
+#define TMPDIR         "/tmp"

 
 pkgCache *DebFile::Cache = 0;
 
 
 pkgCache *DebFile::Cache = 0;
 


@@ -241,21 +245,31 @@ int ShowHelp(void)
 // WriteFile - write the contents of the passed string to a file       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // 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;
 {
        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++);
+        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 = "";

 
 

-       ofstream ofs(fn);
-       if (!ofs)
+       if (!f.Open(fn, FileFd::WriteTemp, 0600))

        {
                _error->Errno("ofstream::ofstream",_("Unable to write to %s"),fn);
                return string();
        }
 
        {
                _error->Errno("ofstream::ofstream",_("Unable to write to %s"),fn);
                return string();
        }
 

-       ofs << (data ? data : "");
-       ofs.close();
+       f.Write(data, strlen(data));
+       f.Close();

        return fn;
 }
                                                                        /*}}}*/
        return fn;
 }
                                                                        /*}}}*/


@@ -264,8 +278,8 @@ string WriteFile(const char *prefix, const char *data)
 /* */
 void WriteConfig(const DebFile &file)
 {
 /* */
 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;
 
        if (templatefile.empty() == true || configscript.empty() == true)
                return;


@@ -284,6 +298,8 @@ bool Go(CommandLine &CmdL)
        List.ReadMainList();
        OpProgress Prog;
        pkgMakeStatusCache(List,Prog,&Map,true);
        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;
        DebFile::Cache = new pkgCache(Map);
        if (_error->PendingError() == true)
                return false;


@@ -299,20 +315,26 @@ bool Go(CommandLine &CmdL)
                // Will pick up the errors later..
                DebFile file(CmdL.FileList[I]);
                if (file.Go() == false)
                // 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
                // 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 != "" &&
                        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 != "" &&
                                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);
                                continue;
 
                        WriteConfig(file);


@@ -336,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}};
                {'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 ||
        // Parse the command line and initialize the package library
        CommandLine CmdL(Args,_config);
        if (pkgInitConfig(*_config) == false ||