diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-07-23 09:47:41 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-07-23 09:47:41 +0200 |
| commit | 76fe5db7153957f8fda437e3bd614312b076f19e (patch) | |
| tree | 7d82f16b3b3c5ee4c48d43ef856b8b4c0eb04018 /apt-pkg | |
| parent | 49cb36fc56225b02b4c39aea43095de15da75217 (diff) | |
methods/cdrom.cc: add AutoDetectAndMount method
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/cdrom.cc | 5 | ||||
| -rw-r--r-- | apt-pkg/cdrom.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 157f0ea3c..8be26e2bc 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -847,7 +847,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) pkgUdevCdromDevices::pkgUdevCdromDevices() - : libudev_handle(NULL), Dlopened(false) + : libudev_handle(NULL) { } @@ -856,7 +856,7 @@ bool pkgUdevCdromDevices::Dlopen() { // alread open - if(Dlopened) + if(libudev_handle != NULL) return true; // see if we can get libudev @@ -878,7 +878,6 @@ pkgUdevCdromDevices::Dlopen() udev_list_entry_get_next = (udev_list_entry* (*)(udev_list_entry*))dlsym(h, "udev_list_entry_get_next"); udev_device_get_property_value = (const char* (*)(udev_device *, const char *))dlsym(h, "udev_device_get_property_value"); - Dlopened = true; return true; } diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index 74667297e..13e7203f4 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -77,8 +77,6 @@ struct CdromDevice class pkgUdevCdromDevices { - private: - bool Dlopened; protected: // libudev dlopen stucture void *libudev_handle; |