Changeset 12966

Timestamp:

2006-10-03T11:53:55+13:00 (18 years ago)

Author:

kjdon

Message:

check_removeold_and_keepold now checks incremental as well

File:

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

trunk/gsdl/perllib/scriptutil.pm

@@ -33 +33 @@
 sub check_removeold_and_keepold {
 
-    my ($removeold, $keepold, $dir, $collectcfg) = @_;
+    my ($removeold, $keepold, $incremental, $dir, $collectcfg) = @_;
 
-    if ($keepold && $removeold) {
+    if (($keepold && $removeold) || ($incremental && $removeold) ) {
     gsprintf(STDERR, "{scripts.both_old_options}\n", $dir);
     sleep(3); #just in case
@@ -42 +42 @@
     } 
 
-    if (!$keepold && !$removeold) {
+    if (!$keepold && !$removeold && !$incremental) {
     # we only look at config file options if we dont have these on the command line
     if (defined $collectcfg->{'removeold'} && $collectcfg->{'removeold'} =~ /^true$/i ) {
@@ -48 +48 @@
     } elsif (defined $collectcfg->{'keepold'} && $collectcfg->{'keepold'} =~ /^true$/i) {
         $keepold = 1;
+    } elsif (defined $collectcfg->{'incremental'} && $collectcfg->{'incremental'} =~ /^true$/i) {
+        $incremental = 1;
     }
     }
-    if (!$keepold && !$removeold) {
+
+    if (!$keepold && !$removeold && !$incremental) {
     gsprintf(STDERR, "{scripts.no_old_options} \n", $dir);
     sleep(3); #just in case
@@ -56 +59 @@
     }
     
-    return ($removeold, $keepold);
+    # incremental implies keepold
+    if ($incremental) {
+    $keepold = 1;
+    }
+    return ($removeold, $keepold, $incremental);
 
 }