summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2007-10-29 18:29:39 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2007-10-29 18:29:39 -0200
commit1fcbe14d0cc5bf9892b0176993a884acffbd6ed7 (patch)
tree3dd25e2f8396a8de20aceb0dc0a439f1c85aad37
parent919e5852f297045cdb409143df663ad630b123e8 (diff)
* Umount CD-ROM when calling apt-cdrom ident, except when called with
-m, closes: #448521.
-rw-r--r--apt-pkg/cdrom.cc7
-rw-r--r--debian/changelog4
2 files changed, 10 insertions, 1 deletions
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index afb067559..0cbdc178f 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -564,6 +564,13 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)
Database.Find("CD::"+ident).c_str());
log->Update(msg.str());
}
+
+ // Unmount and finish
+ if (_config->FindB("APT::CDROM::NoMount",false) == false) {
+ log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);
+ UnmountCdrom(CDROM);
+ }
+
return true;
}
diff --git a/debian/changelog b/debian/changelog
index 36c7aa2c2..70cfd48aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,10 @@ apt (0.7.9) UNRELEASED; urgency=low
* Applied patch from Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
to add backward support for arches that lacks pselect support,
closes: #448406.
+ * Umount CD-ROM when calling apt-cdrom ident, except when called with
+ -m, closes: #448521.
- -- Otavio Salvador <otavio@debian.org> Mon, 29 Oct 2007 15:53:32 -0200
+ -- Otavio Salvador <otavio@ossystems.com.br> Mon, 29 Oct 2007 18:26:27 -0200
apt (0.7.8) unstable; urgency=low