don't rename a file to itself

diff --git a/ChangeLog b/ChangeLog
index a351579ffc0892e5f628bd241144bd39c7c4518c..0cfc6f6a389fa32abe47a2c71b9714e39269a7f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 18 17:48:15 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * scripts/dpkg-source.pl: patch from Colin Watson to not rename a
+    file to itself
+
 Mon Oct 16 10:45:47 EDT 2000 Ben Collins <bcollins@debian.org>
 
   * main/packages.c: Hack up things so a package which

diff --git a/debian/changelog b/debian/changelog
index 41dd2ef9051020c7cbb9fd1514ef0601b2ea3a00..5f18967ba35ff9c109c4cbbed14e446190dd576c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,8 +29,9 @@ dpkg (1.7.0) unstable; urgency=low
   * Document -k option for dpkg-buildpackage. Closes: Bug#71808
   * Install dummy shlibs.default and shlibs.override files
   * Give dpkg a configurationfile
-  * dpkg-scanpackages now uses the most recent version if muiltiple versions
+  * dpkg-scanpackages now uses the most recent version if multiple versions
     of a package are found.
+  * don't rename a file to itself in dpkg-source. Closes: Bug#75060
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index d403b3b21f1c62590934d5e76cc42ea36df1eb2a..5cd4766ca491268d0ffe037842b726fad38cea81 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -945,9 +945,11 @@ sub extracttar {
     @dirchdirfiles = grep($_ ne "." && $_ ne "..",readdir(D));
     closedir(D) || &syserr("Unable to close dir $dirchdir");
     if (@dirchdirfiles==1 && -d "$dirchdir/$dirchdirfiles[0]") {
-       rename("$dirchdir/$dirchdirfiles[0]", "$dirchdir/$newtopdir") ||
-           &syserr("Unable to rename $dirchdir/$dirchdirfiles[0] to ".
-           "$dirchdir/$newtopdir");
+       if ("$dirchdir/$dirchdirfiles[0]" ne "$dirchdir/$newtopdir") {
+           rename("$dirchdir/$dirchdirfiles[0]", "$dirchdir/$newtopdir") ||
+               &syserr("Unable to rename $dirchdir/$dirchdirfiles[0] to ".
+               "$dirchdir/$newtopdir");
+       }
     } else {
        mkdir("$dirchdir/$newtopdir", 0777) ||
            &syserr("Unable to mkdir $dirchdir/$newtopdir");