diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-04-11 20:13:19 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-04-19 01:13:09 +0200 |
| commit | d84da4995df24329e96d57a22136683a9e370f4e (patch) | |
| tree | c3e0eda9c64aedad70b72640976c26fa670c0638 /apt-pkg/cdrom.cc | |
| parent | 34faa8f7ae2526f46cd1f84bb6962ad06d841e5e (diff) | |
ensure lists/ files have correct permissions after apt-cdrom add
Its a bit unpredictable which permissons and owners we will encounter on
a CD-ROM (or a USB stick, as apt-cdrom is responsible for those too),
so we have to ensure in this codepath as well that everything is nicely
setup without waiting for a 'apt-get update' to fix up the (potential)
mess.
Diffstat (limited to 'apt-pkg/cdrom.cc')
| -rw-r--r-- | apt-pkg/cdrom.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 5eccbe5de..8cec4b78e 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -927,8 +927,7 @@ pkgUdevCdromDevices::pkgUdevCdromDevices() /*{{{*/ } /*}}}*/ -bool -pkgUdevCdromDevices::Dlopen() /*{{{*/ +bool pkgUdevCdromDevices::Dlopen() /*{{{*/ { // alread open if(libudev_handle != NULL) @@ -957,18 +956,14 @@ pkgUdevCdromDevices::Dlopen() /*{{{*/ return true; } /*}}}*/ - /*{{{*/ -// convenience interface, this will just call ScanForRemovable -vector<CdromDevice> -pkgUdevCdromDevices::Scan() +// convenience interface, this will just call ScanForRemovable /*{{{*/ +vector<CdromDevice> pkgUdevCdromDevices::Scan() { bool CdromOnly = _config->FindB("APT::cdrom::CdromOnly", true); return ScanForRemovable(CdromOnly); } /*}}}*/ - /*{{{*/ -vector<CdromDevice> -pkgUdevCdromDevices::ScanForRemovable(bool CdromOnly) +vector<CdromDevice> pkgUdevCdromDevices::ScanForRemovable(bool CdromOnly)/*{{{*/ { vector<CdromDevice> cdrom_devices; struct udev_enumerate *enumerate; |