Remove duplicate CLI options

Getopt::Long started warning about duplicate options in
version 2.55 and the change notes say it will become a
fatal error in a future release.

Author: cbrandtbuffalo

lib/RT/Interface/CLI.pm

@@ -189,15 +189,21 @@ sub Init {
         for (@_) {
             m/^([a-zA-Z0-9-]+)/;
             $exists{$1}++;
-            push @args, $_ => \($hash->{$1});
+            # debug is treated specially later
+            push @args, $_ => \($hash->{$1}) unless $1 eq 'debug';
         }
     } else {
         $hash = {};
-        @args = @_;
         while (@_) {
             my $key = shift(@_);
             $exists{$key}++;
-            shift(@_);
+            # debug is treated specially later
+            if ( $key eq 'debug' ) {
+                shift @_;
+            }
+            else {
+                push @args, $key, shift @_;
+            }
         }
     }
 

sbin/rt-setup-database.in

@@ -82,7 +82,7 @@ GetOptions(
     \%args,
     'action=s',
     'force', 'debug',
-    'dba=s', 'dba-password=s', 'prompt-for-dba-password', 'package=s',
+    'dba=s', 'dba-password=s', 'prompt-for-dba-password',
     'datafile=s', 'datadir=s', 'skip-create', 'root-password-file=s',
     'package=s', 'ext-version=s',
     'upgrade-from=s', 'upgrade-to=s',