Changeset 20646

Timestamp:

2009-09-21T12:04:28+12:00 (14 years ago)

Author:

kjdon

Message:

if keepold is true, set incremental_mode to onlyadd

File:

• gsdl/trunk/perllib/scriptutil.pm (modified) (2 diffs)

gsdl/trunk/perllib/scriptutil.pm

@@ -37 +37 @@
     my ($removeold, $keepold, $incremental, $dir, $collectcfg) = @_;    
 
-    # Incremental mode may be set to "none", "onlyadd" or "all"
-    # depending on status of -keepold and -incremental flags
-    my $incremental_mode = ($incremental) ? "all" : "none"; 
-
     if (($keepold && $removeold) || ($incremental && $removeold) ) {
     gsprintf(STDERR, "{scripts.both_old_options}\n", $dir);
@@ -47 +43 @@
     
     } 
+
+    # Incremental mode may be set to "none", "onlyadd" or "all"
+    # depending on status of -keepold and -incremental flags
+    my $incremental_mode = "none";
+    if ($incremental) {
+    $incremental_mode = "all";
+    } elsif ($keepold) {
+    $incremental_mode = "onlyadd";
+    }
 
     if (!$keepold && !$removeold && !$incremental && defined $collectcfg) {