From 314555a95560264aee5a9b1aa992a1f962ae6fea Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 18 Sep 2007 17:47:16 +0100 Subject: apt-pkg/deb/dpkgpm.cc: - make it compileable --- apt-pkg/deb/dpkgpm.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 28b895ac7..b92d0118c 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -398,7 +398,6 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line) std::clog << "ignoring line: not enough ':'" << std::endl; return; } - char *action = list[0]; char *pkg = list[1]; char *action = _strstrip(list[2]); -- cgit v1.2.3 From 526d43695b00573dcd8d323348a6b30d5215540b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Sep 2007 11:17:18 +0200 Subject: * cmdline/apt-mark: - Fix chmoding after have renamed the extended-states file (LP: #140019) (thanks to Laurent Bigonville) --- cmdline/apt-mark | 4 ++-- debian/changelog | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmdline/apt-mark b/cmdline/apt-mark index fdc3e1856..f6e749eb5 100755 --- a/cmdline/apt-mark +++ b/cmdline/apt-mark @@ -40,7 +40,7 @@ if __name__ == "__main__": if not options.filename: STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states" else: - STATE_FILE=options.state_file + STATE_FILE=options.filename # open the statefile if os.path.exists(STATE_FILE): @@ -62,4 +62,4 @@ if __name__ == "__main__": # all done, rename the tmpfile os.chmod(outfile.name, 0644) os.rename(outfile.name, STATE_FILE) - os.chmod(outfile.name, 0644) + os.chmod(STATE_FILE, 0644) diff --git a/debian/changelog b/debian/changelog index 46b6dc7bf..a271c6a6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,9 @@ apt (0.7.7) UNRELEASED; urgency=low * cmdline/apt-get.cc: - do not change the auto-installed information if a package is reinstalled + * cmdline/apt-mark: + - Fix chmoding after have renamed the extended-states file (LP: #140019) + (thanks to Laurent Bigonville) [ Ian Jackson ] * dpkg-triggers: Deal properly with new package states. -- cgit v1.2.3