From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 3 Mar 2009 05:13:11 +0000 (-0500)
Subject: transitions/0.23: when backing up old gnupg-{host,authentication}, timestamp backups... 
X-Git-Tag: monkeysphere_0.24~9
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=cf04c38691c1fa80ad9ac65175e034fbff7ab0c3

transitions/0.23: when backing up old gnupg-{host,authentication}, timestamp backups so that they are relatively unique: this makes collisions less likely if the script gets run twice (failing the first time), and helps record the history of the cleanup as well
---

diff --git a/src/transitions/0.23 b/src/transitions/0.23
index 4410ae8..3964558 100755
--- a/src/transitions/0.23
+++ b/src/transitions/0.23
@@ -193,7 +193,7 @@ if [ -d "$SYSDATADIR"/gnupg-host ] ; then
 
     mkdir -p "$STASHDIR"
     chmod 0700 "$STASHDIR"
-    mv "${SYSDATADIR}/gnupg-host" "$STASHDIR"
+    mv "${SYSDATADIR}/gnupg-host" "$STASHDIR"/gnupg-host.$(date '+%F_%T%z')
 fi
 
 
@@ -209,5 +209,5 @@ if [ -d "${SYSDATADIR}/gnupg-authentication" ] ; then
 
     mkdir -p "$STASHDIR"
     chmod 0700 "$STASHDIR"
-    mv "${SYSDATADIR}/gnupg-authentication" "$STASHDIR"
+    mv "${SYSDATADIR}/gnupg-authentication" "$STASHDIR"/gnupg-authentication.$(date '+%F_%T%z')
 fi