merge r12925 to 8.09

SVN-Revision: 12926

diff --git a/scripts/env b/scripts/env
index 642a329c16f5fee39a01336e675ce957fbc52bb1..65594f9a5d04b74f7372bf65ed699615426a817a 100755 (executable)
--- a/scripts/env
+++ b/scripts/env
@@ -119,12 +119,12 @@ env_revert() {
 }
 
 env_ask_sync() {
+       env_sync_data
        LINES="$(env_diff | wc -l)" # implies env_init
        [ "$LINES" -gt 0 ] && {
                if ask_bool 1 "Do you want to save your changes"; then
                        env_sync
                else
-                       env_sync_data
                        env_do_reset
                fi
        }