Added code to allow SmartConfigure to be called mutiple times on the same package...

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

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 6d580cc28b55417f8e69a02f26ab3b17b21b82b6..07bc0c25d053d6a17453d67e3d84d87078211bf5 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -249,7 +249,7 @@ string WriteFile(const char *package, const char *prefix, const char *data)
 {
        char fn[512];
        static int i;
 {
        char fn[512];
        static int i;

-        char *tempdir = NULL;
+       const char *tempdir = NULL;

 
         tempdir = getenv("TMPDIR");
         if (tempdir == NULL)
 
         tempdir = getenv("TMPDIR");
         if (tempdir == NULL)


@@ -296,8 +296,7 @@ bool Go(CommandLine &CmdL)
        MMap *Map = 0;
        pkgSourceList List;
        List.ReadMainList();
        MMap *Map = 0;
        pkgSourceList List;
        List.ReadMainList();

-       OpProgress Prog;
-       pkgMakeStatusCache(List,Prog,&Map,true);
+       pkgCacheGenerator::MakeStatusCache(List,NULL,&Map,true);

        if (Map == 0)
           return false;
        DebFile::Cache = new pkgCache(Map);
        if (Map == 0)
           return false;
        DebFile::Cache = new pkgCache(Map);


@@ -348,8 +347,7 @@ bool Go(CommandLine &CmdL)
        return !_error->PendingError();
 }
                                                                        /*}}}*/
        return !_error->PendingError();
 }
                                                                        /*}}}*/

-
-int main(int argc, const char **argv)
+int main(int argc, const char **argv)                                  /*{{{*/

 {
        CommandLine::Args Args[] = {
                {'h',"help","help",0},
 {
        CommandLine::Args Args[] = {
                {'h',"help","help",0},


@@ -391,3 +389,4 @@ int main(int argc, const char **argv)
        
        return 0;
 }
        
        return 0;
 }

+                                                                       /*}}}*/