summaryrefslogtreecommitdiff
path: root/apt-pkg/cdrom.h
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-08-09 14:38:01 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-08-09 14:38:01 +0200
commit216d0bd8869c4f52ead5256064512ac97e9fc824 (patch)
treeea6911a231e29b73a883d4449fe7f88941ddd92d /apt-pkg/cdrom.h
parent629b60f6feea2d2d356645aa2615b212481bd3d8 (diff)
parent97efc27f0723f09405d7a1836ab21c2e2948eb10 (diff)
merged from the debian-experimental2 branch
Diffstat (limited to 'apt-pkg/cdrom.h')
-rw-r--r--apt-pkg/cdrom.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index e83c38582..614062cbb 100644
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -92,9 +92,7 @@ class pkgUdevCdromDevices /*{{{*/
struct udev_enumerate *(*udev_enumerate_new) (struct udev *udev);
struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_entry *list_entry);
const char* (*udev_device_get_property_value)(struct udev_device *udev_device, const char *key);
-#if 0 // FIXME: uncomment on next ABI break
int (*udev_enumerate_add_match_sysattr)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);
-#endif
// end libudev dlopen
public:
@@ -104,11 +102,11 @@ class pkgUdevCdromDevices /*{{{*/
// try to open
bool Dlopen();
- // this is the new interface
- vector<CdromDevice> ScanForRemovable(bool CdromOnly);
- // FIXME: compat with the old interface/API/ABI only
+ // convenience interface, this will just call ScanForRemovable
+ // with "APT::cdrom::CdromOnly"
vector<CdromDevice> Scan();
+ vector<CdromDevice> ScanForRemovable(bool CdromOnly);
};
/*}}}*/