debian/changelog: make the build-dep changelog entry match (debian) reality

[apt.git] / apt-pkg / cdrom.cc

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index afb06755989dd194b39dac86f43da3e9f980cf61..370687f2485a632ecb6073d58a74bc7b340833d1 100644 (file)
--- 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());
    }
       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;
 }
 
    return true;
 }
 


@@ -668,8 +675,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
    DropRepeats(TransList,"");
    if(log) {
       msg.str("");
    DropRepeats(TransList,"");
    if(log) {
       msg.str("");

-      ioprintf(msg, _("Found %u package indexes, %u source indexes, "
-                     "%u translation indexes and %u signatures\n"), 
+      ioprintf(msg, _("Found %zu package indexes, %zu source indexes, "
+                     "%zu translation indexes and %zu signatures\n"), 

               List.size(), SourceList.size(), TransList.size(),
               SigList.size());
       log->Update(msg.str(), STEP_SCAN);
               List.size(), SourceList.size(), TransList.size(),
               SigList.size());
       log->Update(msg.str(), STEP_SCAN);