# 
# 
# patch "ChangeLog"
#  from [b6269bd2f0bb3e53131c2d59857ea260980c0ce4]
#    to [643b9200f7bf1186af7d2a3731676af834ddba10]
# 
# patch "debian/monotone-server.postinst"
#  from [535b1c615f94331477c7964134e397c772e13553]
#    to [69ca5ca157be466099f3ee3bd81f5fb7a85a7acb]
# 
============================================================
--- ChangeLog	b6269bd2f0bb3e53131c2d59857ea260980c0ce4
+++ ChangeLog	643b9200f7bf1186af7d2a3731676af834ddba10
@@ -1,4 +1,11 @@
 2006-04-13  Matthew Nicholson  <address@hidden>
+
+	* debian/monotone-server.postinst: Only try to
+	migrate/rosterify/whatever database once.  If it fails print a
+	message.  This is how the script was coded but 'set -e' prevented it
+	from working properly.
+
+2006-04-13  Matthew Nicholson  <address@hidden>
 	
 	* debian/control: Made monotone-server's Architecture 'all' instead of
 	'any', as it does not contain any architecture dependent files.
============================================================
--- debian/monotone-server.postinst	535b1c615f94331477c7964134e397c772e13553
+++ debian/monotone-server.postinst	69ca5ca157be466099f3ee3bd81f5fb7a85a7acb
@@ -119,6 +119,8 @@
               echo "A backup named '`basename $MTN_DB~`' will be created in $MTN_HOME." >&2
 
               cp $MTN_DB $MTN_DB~
+
+              set +e
               $MONOTONE --db=$MTN_DB db migrate --rcfile=$MTN_CONFDIR/hooks.lua \
                  --norc --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR >&2
 
@@ -144,6 +146,7 @@
                  echo "Please see UPGRADE and README.changesets in /usr/share/doc/monotone for" >&2
                  echo "information on manually upgrading your database." >&2
               fi
+              set -e
            fi
 
            echo "$MTN_KEY \"$MTN_KEY_PASSWD\"" > $MTN_CONFDIR/passphrases