diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-08-06 15:53:07 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-08-06 15:53:07 +0200 |
| commit | 1ce0597f39134fe2948d621d566b7c3c8f278d91 (patch) | |
| tree | 80f757e492b2e0d8d5d2de62e2a1663a3d165d14 | |
| parent | 5d372ca57d41f5c1a81bd849a7e4d6880f935f54 (diff) | |
| parent | 1ba381717c81d4a06091ab1ededf70af55801b19 (diff) | |
* merged from apt--mvo
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 6 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index e9333600c..a65f6eb0a 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -45,8 +45,8 @@ using namespace std; // --------------------------------------------------------------------- /* */ pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) - : pkgPackageManager(Cache), dpkgbuf_pos(0), - PackagesTotal(0), PackagesDone(0), term_out(NULL) + : pkgPackageManager(Cache), dpkgbuf_pos(0), PackagesDone(0), + PackagesTotal(0), term_out(NULL) { } /*}}}*/ @@ -819,7 +819,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) continue; if(master >= 0 && FD_ISSET(master, &rfds)) - DoTerminalPty(master, term_out); + DoTerminalPty(master); if(master >= 0 && FD_ISSET(0, &rfds)) DoStdin(master); if(FD_ISSET(_dpkgin, &rfds)) diff --git a/configure.in b/configure.in index 364a23159..b2f10baed 100644 --- 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.7.6ubuntu1") +AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) |