* apt-pkg/contrib/fileutl.cc:

[apt.git] / apt-pkg / contrib / cdromutl.cc

diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc
index 9c00f94b5fc4dc2c93fda1d6ddc4fce0f896606e..68b98040722e3b611a03e16d30a227ea015fad40 100644 (file)
--- a/apt-pkg/contrib/cdromutl.cc
+++ b/apt-pkg/contrib/cdromutl.cc
@@ -156,11 +156,14 @@ bool MountCdrom(string Path, string DeviceName)
 bool IdentCdrom(string CD,string &Res,unsigned int Version)
 {
    MD5Summation Hash;
 bool IdentCdrom(string CD,string &Res,unsigned int Version)
 {
    MD5Summation Hash;

+   bool writable_media = false;

 
    // if we are on a writable medium (like a usb-stick) that is just
    // used like a cdrom don't use "." as it will constantly change,
    // use .disk instead
 
    // if we are on a writable medium (like a usb-stick) that is just
    // used like a cdrom don't use "." as it will constantly change,
    // use .disk instead

-   if (access(CD.c_str(), W_OK) == 0 && DirectoryExists(CD+string("/.disk"))) {
+   if (access(CD.c_str(), W_OK) == 0 && DirectoryExists(CD+string("/.disk"))) 
+   {
+      writable_media = true;

       CD = CD.append("/.disk");
       if (_config->FindB("Debug::aptcdrom",false) == true)
          std::clog << "Found writable cdrom, using alternative path: " << CD
       CD = CD.append("/.disk");
       if (_config->FindB("Debug::aptcdrom",false) == true)
          std::clog << "Found writable cdrom, using alternative path: " << CD


@@ -212,10 +215,15 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version)
       struct statvfs Buf;
       if (statvfs(CD.c_str(),&Buf) != 0)
         return _error->Errno("statfs",_("Failed to stat the cdrom"));
       struct statvfs Buf;
       if (statvfs(CD.c_str(),&Buf) != 0)
         return _error->Errno("statfs",_("Failed to stat the cdrom"));

-      
+

       // We use a kilobyte block size to advoid overflow
       // We use a kilobyte block size to advoid overflow

-      sprintf(S,"%lu %lu",(long)(Buf.f_blocks*(Buf.f_bsize/1024)),
-             (long)(Buf.f_bfree*(Buf.f_bsize/1024)));
+      if (writable_media)
+      {
+         sprintf(S,"%lu",(long)(Buf.f_blocks*(Buf.f_bsize/1024)));
+      } else {
+         sprintf(S,"%lu %lu",(long)(Buf.f_blocks*(Buf.f_bsize/1024)),
+                 (long)(Buf.f_bfree*(Buf.f_bsize/1024)));
+      }

       Hash.Add(S);
       sprintf(S,"-%u",Version);
    }
       Hash.Add(S);
       sprintf(S,"-%u",Version);
    }