* apt-pkg/cdrom.cc:

  - do not link() but rename() the cdroms.list to cdroms.list~ as a backup
    to ensure that apt-cdrom can be run multiple times (Closes: #676302)

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 8462e82860cd721bbe280b82fd77d03103e9e991..699f66fb3fa1618be373b036a9f2850c7625f8c8 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -413,8 +413,8 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf)
 
    Out.close();
 
-   if (FileExists(DFile) == true && link(DFile.c_str(),string(DFile + '~').c_str()) != 0)
-      return _error->Errno("link", "Failed to link %s to %s~", DFile.c_str(), DFile.c_str());
+   if (FileExists(DFile) == true)
+      rename(DFile.c_str(), string(DFile + '~').c_str());
    if (rename(NewFile.c_str(),DFile.c_str()) != 0)
       return _error->Errno("rename","Failed to rename %s.new to %s",
                           DFile.c_str(),DFile.c_str());

diff --git a/debian/changelog b/debian/changelog
index 7092d816405af97bd105d9096c57f037287b5a75..3bed49ec06d6eaad4c59c1ea9ef34f5730cbc2c5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,9 @@ apt (0.9.7.4) UNRELEASED; urgency=low
   * apt-pkg/indexcopy.cc:
     - do not use atomic writing if the target is /dev/null as we don't want
       to replace it, not even automically. (Closes: #683410)
+  * apt-pkg/cdrom.cc:
+    - do not link() but rename() the cdroms.list to cdroms.list~ as a backup
+      to ensure that apt-cdrom can be run multiple times (Closes: #676302)
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 18 Jul 2012 11:45:57 +0200