* fix apt-pkg/cdrom.cc to umount the cdrom again if anything fails

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index c067cf1eec0434373ac412994601100ea9fe19c0..ce1beb39b8c3b24084fadc155cf2efa2573671e0 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -567,7 +567,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
    string DFile = _config->FindFile("Dir::State::cdroms");
    if (FileExists(DFile) == true)
    {
    string DFile = _config->FindFile("Dir::State::cdroms");
    if (FileExists(DFile) == true)
    {

-      if (ReadConfigFile(Database,DFile) == false)
+      if (ReadConfigFile(Database,DFile) == false) 

         return _error->Error("Unable to read the cdrom database %s",
                              DFile.c_str());
    }
         return _error->Error("Unable to read the cdrom database %s",
                              DFile.c_str());
    }


@@ -650,8 +650,11 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
       log->Update(msg.str(), STEP_SCAN);
    }
 
       log->Update(msg.str(), STEP_SCAN);
    }
 

-   if (List.size() == 0 && SourceList.size() == 0)
+   if (List.size() == 0 && SourceList.size() == 0) 
+   {
+      UnmountCdrom(CDROM);

       return _error->Error("Unable to locate any package files, perhaps this is not a Debian Disc");
       return _error->Error("Unable to locate any package files, perhaps this is not a Debian Disc");

+   }

 
    // Check if the CD is in the database
    string Name;
 
    // Check if the CD is in the database
    string Name;


@@ -687,7 +690,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
          Name.empty() == true)
       {
         if(!log) 
          Name.empty() == true)
       {
         if(!log) 

+         {
+           UnmountCdrom(CDROM);

            return _error->Error("No disc name found and no way to ask for it");
            return _error->Error("No disc name found and no way to ask for it");

+        }

 
         while(true) {
            if(!log->AskCdromName(Name)) {
 
         while(true) {
            if(!log->AskCdromName(Name)) {


@@ -760,7 +766,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
    {
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)
    {
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)

+      {
+        UnmountCdrom(CDROM);

         return _error->Error("Internal error");
         return _error->Error("Internal error");

+      }

 
       if(log) {
         msg.str("");
 
       if(log) {
         msg.str("");


@@ -774,7 +783,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
    {
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)
    {
       string::size_type Space = (*I).find(' ');
       if (Space == string::npos)

+      {
+        UnmountCdrom(CDROM);

         return _error->Error("Internal error");
         return _error->Error("Internal error");

+      }

 
       if(log) {
         msg.str("");
 
       if(log) {
         msg.str("");

diff --git a/configure.in b/configure.in
index d9c3289ff26ce9b7f19827af3e88b352b8b80eed..87dac8e47e7c4741a8f02815b351885513f60232 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --

-AC_DEFINE_UNQUOTED(VERSION,"0.6.41")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.41.1")

 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index cc3da8f84d17448759c5eaffd3afe0c67712b86e..e88689667993fb591ea76c22c7517c1ffcf4506c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.6.41.1) unstable; urgency=low
+
+  * apt-pkg/cdrom.cc:
+    - unmount the cdrom when apt failed to locate any package files
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 12 Sep 2005 13:45:53 +0200
+

 apt (0.6.41) unstable; urgency=low
 
   * improved the support for "error" and "conffile" reporting from
 apt (0.6.41) unstable; urgency=low
 
   * improved the support for "error" and "conffile" reporting from