summaryrefslogtreecommitdiff
path: root/apt-pkg/cdrom.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-11-28 14:00:40 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2007-11-28 14:00:40 +0100
commitce1b2acbafafe111a09846b15183ef42eecf2be5 (patch)
tree88378b5b8b341e16f2a3647ca1cdf9a145689fd5 /apt-pkg/cdrom.cc
parent7052511ef60897a02c00da43a309465380f93603 (diff)
parent757f20941a19d5e1e9ebd74ecd5a4d5b0012644f (diff)
merge from the debian apt branch
Diffstat (limited to 'apt-pkg/cdrom.cc')
-rw-r--r--apt-pkg/cdrom.cc11
1 files changed, 9 insertions, 2 deletions
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index b8f94e5b0..0cbdc178f 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -560,10 +560,17 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)
}
if(log) {
msg.str("");
- ioprintf(msg, _("Stored label: %s \n"),
- Database.Find("CD::"+ident).c_str());
+ ioprintf(msg, _("Stored label: %s\n"),
+ 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;
}