[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.3-10-ga9e84c5

[Kevin Falcone]

The branch, 4.2-trunk has been updated
       via  a9e84c50e493be83ba2476433823fa359ea010f7 (commit)
      from  588a2a41fd2e33f7f9086a5f4d59e8253da3d513 (commit)

Summary of changes:
 sbin/rt-setup-database.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit a9e84c50e493be83ba2476433823fa359ea010f7
Author: Dominic Hargreaves <dom at earth.li>
Date:   Tue Feb 25 22:07:03 2014 +0000

    Don't warn about backups with --force
    
    If you're forcing an upgrade (usually to use --upgrade-from and --upgrade-
    to) watching a warning about backups scroll by doesn't help.
    
    In the Debian package this switch is used after the maintenance scripts
    have already taken a backup.

diff --git a/sbin/rt-setup-database.in b/sbin/rt-setup-database.in
index de05e6d..c22306f 100644
--- a/sbin/rt-setup-database.in
+++ b/sbin/rt-setup-database.in
@@ -490,8 +490,10 @@ sub action_upgrade {
         }
     }
 
-    print "\nIT'S VERY IMPORTANT TO BACK UP BEFORE THIS STEP\n\n";
-    _yesno() or exit(-2) unless $args{'force'};
+    unless ( $args{'force'} ) {
+        print "\nIT'S VERY IMPORTANT TO BACK UP BEFORE THIS STEP\n\n";
+        _yesno() or exit(-2);
+    }
 
     RT->ConnectToDatabase();
     RT->InitSystemObjects();

-----------------------------------------------------------------------