From 25ee65dd5155fda6dd3754d091b86acb5d7bd9dc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 26 Jan 2010 15:56:29 +0100 Subject: * apt-pkg/cdrom.cc: - fix crash in pkgUdevCdromDevices --- apt-pkg/cdrom.cc | 3 ++- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 72d8e4d41..3467f49d7 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -921,6 +921,7 @@ pkgUdevCdromDevices::Scan() /*{{{*/ pkgUdevCdromDevices::~pkgUdevCdromDevices() /*{{{*/ { - dlclose(libudev_handle); + if (libudev_handle != NULL) + dlclose(libudev_handle); } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 7e38cda99..baf541e14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ apt (0.7.25.1) UNRELEASED; urgency=low * apt-pkg/contrib/cdromutl.cc: - fix UnmountCdrom() fails, give it a bit more time and try the umount again + * apt-pkg/cdrom.cc: + - fix crash in pkgUdevCdromDevices * methods/cdrom.cc: - fixes in multi cdrom setup code - add new "Acquire::cdrom::AutoDetect" variable that enables/disables -- cgit v1.2.3 From 73176ffaf95b5c214575752e77fb4acfcf76d415 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 27 Jan 2010 12:00:35 +0100 Subject: debian/apt.dirs: remove var/lib/apt/media again --- debian/apt.dirs | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/apt.dirs b/debian/apt.dirs index b812f116b..fb6716c35 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -9,7 +9,6 @@ etc/logrotate.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/apt/periodic -var/lib/apt/media var/log/apt usr/share/bug/apt usr/share/lintian/overrides -- cgit v1.2.3 From 5810683948b6e46223db4e873160b01dd5ad6aac Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 27 Jan 2010 12:05:22 +0100 Subject: debian/changelog: add --auto-detect option --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index baf541e14..a150197b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ apt (0.7.25.1) UNRELEASED; urgency=low - fixes in multi cdrom setup code - add new "Acquire::cdrom::AutoDetect" variable that enables/disables the dlopen of libudev for automatic cdrom detection + * cmdline/apt-cdrom.cc: + - add new --auto-detect option that uses libudev to figure out + the cdrom/mount-point -- Michael Vogt Fri, 18 Dec 2009 16:54:18 +0100 -- cgit v1.2.3