about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2016-09-02 18:12:19 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2016-09-02 18:12:19 +0000
commit37fcd3da88c1292671c867756c117b64a69917d6 (patch)
tree8b818a2eb071742d6eac786a82f0b7a30bd81571
parent46b5b8da8357e7785760d83b79a75ceff1c61073 (diff)
downloadnetpbm-mirror-37fcd3da88c1292671c867756c117b64a69917d6.tar.gz
netpbm-mirror-37fcd3da88c1292671c867756c117b64a69917d6.tar.xz
netpbm-mirror-37fcd3da88c1292671c867756c117b64a69917d6.zip
Release 10.73.05
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@2817 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY8
-rwxr-xr-xeditor/pnmquantall3
-rw-r--r--version.mk2
3 files changed, 11 insertions, 2 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index 28e892c9..f7d49aa2 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,14 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+16.09.02 BJH  Release 10.73.05
+
+              pnmquantall: Fix failure when temporary file location is
+              not the same filesystem as the output file.
+
+              pnmquantall: Fix incorrect handling of when the Pnmremap or
+              the final rename fails.
+
 16.08.13 BJH  Release 10.73.04
 
               giftopnm: Fix bug: crash on little-endian computers that can't
diff --git a/editor/pnmquantall b/editor/pnmquantall
index 0890383e..2f1a3adf 100755
--- a/editor/pnmquantall
+++ b/editor/pnmquantall
@@ -56,6 +56,7 @@ use strict;
 use warnings;
 use English;
 use Fcntl;  # gets open flags
+use File::Copy;
 
 my $TRUE=1; my $FALSE = 0;
 
@@ -163,7 +164,7 @@ sub remapFiles($$$$) {
                 my $newFileName = $inFileName . $ext;
 
                 unlink($newFileName);
-                rename($outputFileName, $newFileName)
+                File::Copy::move($outputFileName, $newFileName)
                     or $errorR = "Rename to '$newFileName' failed.";
             }
         }
diff --git a/version.mk b/version.mk
index 0f1fa602..33942856 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 73
-NETPBM_POINT_RELEASE = 4
+NETPBM_POINT_RELEASE = 5