[elpa] externals-release/plz 0b2fc911dd 4/5: Merge: Don't delete preexisting files

[ELPA Syncer]

branch: externals-release/plz
commit 0b2fc911dd66790ef6ad8b6d129942150aa51115
Merge: 61b0f8dbfd 87832417ca
Author: Adam Porter <adam@alphapapa.net>
Commit: Adam Porter <adam@alphapapa.net>

    Merge: Don't delete preexisting files
---
 README.org |  3 ++-
 plz.el     |  4 ++++
 plz.info   | 39 +++++++++++++++++++++------------------
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/README.org b/README.org
index 8a455b934e..cba9a0f93b 100644
--- a/README.org
+++ b/README.org
@@ -181,7 +181,8 @@ You may also clear a queue with ~plz-clear~, which cancels 
any active or queued
 
 ** 0.7.2-pre
 
-Nothing new yet.
+*Fixes*
++ Don't delete preexisting files when downloading to a file.  
([[https://github.com/alphapapa/plz.el/pull/41][#41]]. Thanks to 
[[https://github.com/josephmturner][Joseph Turner]].)
 
 ** 0.7.1
 
diff --git a/plz.el b/plz.el
index 8d4f7a5729..a5cc82ea07 100644
--- a/plz.el
+++ b/plz.el
@@ -449,6 +449,8 @@ NOQUERY is passed to `make-process', which see.
                       (progn
                         (write-region (point-min) (point-max) filename)
                         (funcall then filename))
+                    (file-already-exists
+                     (funcall then (make-plz-error :message (format "error 
while writing to file %S: %S" filename err))))
                     ;; In case of an error writing to the file, delete the 
temp file
                     ;; and signal the error.  Ignore any errors encountered 
while
                     ;; deleting the file, which would obscure the original 
error.
@@ -463,6 +465,8 @@ NOQUERY is passed to `make-process', which see.
               (progn
                 (write-region (point-min) (point-max) filename nil nil nil 
'excl)
                 (funcall then filename))
+            (file-already-exists
+             (funcall then (make-plz-error :message (format "error while 
writing to file %S: %S" filename err))))
             ;; Since we are creating the file, it seems sensible to delete it 
in case of an
             ;; error while writing to it (e.g. a disk-full error).  And we 
ignore any errors
             ;; encountered while deleting the file, which would obscure the 
original error.
diff --git a/plz.info b/plz.info
index a73a90a6fd..548b9a9767 100644
--- a/plz.info
+++ b/plz.info
@@ -315,7 +315,10 @@ File: README.info,  Node: 072-pre,  Next: 071,  Up: 
Changelog
 3.1 0.7.2-pre
 =============
 
-Nothing new yet.
+*Fixes*
+   • Don’t delete preexisting files when downloading to a file.  (#41
+     (https://github.com/alphapapa/plz.el/pull/41).  Thanks to Joseph
+     Turner (https://github.com/josephmturner).)
 
 
 File: README.info,  Node: 071,  Next: 07,  Prev: 072-pre,  Up: Changelog
@@ -573,23 +576,23 @@ Node: Queueing7476
 Node: Tips8859
 Node: Changelog9160
 Node: 072-pre9457
-Node: 0719569
-Node: 079786
-Node: 0611674
-Node: 05412285
-Node: 05312528
-Node: 05212844
-Node: 05113051
-Node: 0513303
-Node: 0413509
-Node: 0314417
-Node: 02114867
-Node: 0215018
-Node: 0115149
-Node: Credits15245
-Node: Development15611
-Node: Copyright assignment16125
-Node: License16713
+Node: 0719753
+Node: 079970
+Node: 0611858
+Node: 05412469
+Node: 05312712
+Node: 05213028
+Node: 05113235
+Node: 0513487
+Node: 0413693
+Node: 0314601
+Node: 02115051
+Node: 0215202
+Node: 0115333
+Node: Credits15429
+Node: Development15795
+Node: Copyright assignment16309
+Node: License16897
 
 End Tag Table