From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 2 Oct 2007 12:33:32 +0000 (-0300)
Subject:   - apt-pkg/deb/dpkgpm.cc: initialization order and conversion from
X-Git-Tag: 0.7.21~227^2~4
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/71afbdb50df4058a56ed567f03c9a82f5f9d130e?hp=9504f6f95ba38205551275f94069799ce8683657

  - apt-pkg/deb/dpkgpm.cc: initialization order and conversion from
    string constant to 'char*';
---

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index b92d0118c..92f96620f 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -44,8 +44,8 @@ using namespace std;
 // ---------------------------------------------------------------------
 /* */
 pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) 
-   : pkgPackageManager(Cache), dpkgbuf_pos(0), PackagesDone(0), 
-     PackagesTotal(0), term_out(NULL)
+   : pkgPackageManager(Cache), dpkgbuf_pos(0),
+     term_out(NULL), PackagesDone(0), PackagesTotal(0)
 {
 }
 									/*}}}*/
@@ -770,7 +770,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 
 	 /* No Job Control Stop Env is a magic dpkg var that prevents it
 	    from using sigstop */
-	 putenv("DPKG_NO_TSTP=yes");
+	 putenv((char *)"DPKG_NO_TSTP=yes");
 	 execvp(Args[0],(char **)Args);
 	 cerr << "Could not exec dpkg!" << endl;
 	 _exit(100);
diff --git a/debian/changelog b/debian/changelog
index 61bb75129..592fbe14d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,8 @@ apt (0.7.7) UNRELEASED; urgency=low
     - apt-pkg/acquire-item.cc: likewise;
     - apt-pkg/cdrom.cc: '%lu' expects 'long unsigned int', but argument
       has type 'size_t';
+    - apt-pkg/deb/dpkgpm.cc: initialization order and conversion from
+      string constant to 'char*';
 
   [ Ian Jackson ]
   * dpkg-triggers: Deal properly with new package states.