diff options
| author | Michael Vogt <egon@debian-devbox> | 2012-03-06 18:10:02 +0100 |
|---|---|---|
| committer | Michael Vogt <egon@debian-devbox> | 2012-03-06 18:10:02 +0100 |
| commit | 7296e47e10687e554a4756f65e9c842f88e696e3 (patch) | |
| tree | ce9c6f63729900dcf0d221c2aaafbfef91f34ed4 /cmdline/apt-cdrom.cc | |
| parent | e2625f67efae93c2c8affff41ce3e5fb9a507f30 (diff) | |
| parent | de31189fca11b7de937a64de90bcc050b76f9181 (diff) | |
merged from lp:~donkult/apt/experimental
Diffstat (limited to 'cmdline/apt-cdrom.cc')
| -rw-r--r-- | cmdline/apt-cdrom.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index fa48debcd..0017d954e 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -150,10 +150,9 @@ bool DoAdd(CommandLine &) bool res = true; bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true); - unsigned int count = 0; - if (AutoDetect && UdevCdroms.Dlopen()) { + unsigned int count = 0; while (AutoDetectCdrom(UdevCdroms, count)) res &= cdrom.Add(&log); } else { @@ -178,10 +177,10 @@ bool DoIdent(CommandLine &) bool res = true; bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect"); - unsigned int count = 0; - + if (AutoDetect && UdevCdroms.Dlopen()) { + unsigned int count = 0; while (AutoDetectCdrom(UdevCdroms, count)) res &= cdrom.Ident(ident, &log); } else { |