* fix a bug when readStateFile is called with no OpProgress object

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 05512e179d94d8267059f4b1a035b2c0a1987b37..366687382121aad69d04f4de9e20da089d4db955 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -112,8 +112,9 @@ bool pkgDepCache::readStateFile(OpProgress *Prog)
    if(FileExists(state)) {
       state_file.Open(state, FileFd::ReadOnly);
       int file_size = state_file.Size();
-      Prog->OverallProgress(0, file_size, 1, 
-                           _("Reading state information"));
+      if(Prog != NULL)
+        Prog->OverallProgress(0, file_size, 1, 
+                              _("Reading state information"));
 
       pkgTagFile tagfile(&state_file);
       pkgTagSection section;
@@ -131,11 +132,13 @@ bool pkgDepCache::readStateFile(OpProgress *Prog)
               std::cout << "Install-Reason for: " << pkgname 
                         << " is " << reason << std::endl;
            amt+=section.size();
-           Prog->OverallProgress(amt, file_size, 1, 
-                                 _("Reading state information"));
+           if(Prog != NULL)
+              Prog->OverallProgress(amt, file_size, 1, 
+                                    _("Reading state information"));
         }
-        Prog->OverallProgress(file_size, file_size, 1, 
-                              _("Reading state information"));
+        if(Prog != NULL)
+           Prog->OverallProgress(file_size, file_size, 1, 
+                                 _("Reading state information"));
       }
    }
 

diff --git a/configure.in b/configure.in
index f78ce1d1e42a46603b13a6f6e81f5bbfa8ee5422..2cbbd4b554333b0c29d79546f75ab59bb95f6dba 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.38ubuntu1mvo1")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.39ubuntu1mvo1")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 86dca75bcf1ad6d55b9208e6350dd715bdd301ee..a18f18f1a529174c7b1f05894325a7bb94ed48ac 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ apt (0.6.39ubuntu1mvo1) unstable; urgency=low
       only timeout once per sources.list line
     - support for automatic removal of unused dependencies added
 
- -- 
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 29 Jun 2005 13:01:36 +0200
 
 apt (0.6.39) unstable; urgency=low