* apt-pkg/cdrom.cc:

  - only unmount if APT::CDROM::NoMount is false
* methods/cdrom.cc:  
  - only umount if it was mounted by the method before

1 files changed, 3 insertions, 6 deletions

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 241688785..4d45d38a2 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -508,10 +508,8 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)
 		      CDROM.c_str());
       log->Update(msg.str());
    }
-
-   if (_config->FindB("APT::CDROM::NoMount",false) == false)
-      if (MountCdrom(CDROM) == false)
-	 return _error->Error("Failed to mount the cdrom.");
+   if (MountCdrom(CDROM) == false)
+      return _error->Error("Failed to mount the cdrom.");
 
    // Hash the CD to get an ID
    if(log) 
@@ -805,8 +803,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
    
 
    // Unmount and finish
-   if (_config->FindB("APT::CDROM::NoMount",false) == false &&
-       _config->FindB("APT::CDROM::UnMountOnFinish",true) == true) {
+   if (_config->FindB("APT::CDROM::NoMount",false) == false) {
       log->Update(_("Unmounting CD-ROM..."), STEP_LAST);
       UnmountCdrom(CDROM);
    }