Changeset 297

Timestamp:

11/26/06 23:28:54 (7 years ago)

Author:

max

Message:

Added --update-version for {12}

Files:

• applications/shepherd (modified) (5 diffs)
• status (modified) (1 diff)

applications/shepherd

@@ -3 +3 @@
 my $myprogname = 'shepherd';
 my $progname = 'shepherd';
-my $version = '0.3.32';
+my $version = '0.3.33';
 
 # tv_grab_au
@@ -233 +233 @@
     $ver = $components->{$proggy}->{ver} if (defined $components->{$proggy} and -e query_filename($proggy,$progtype));
 
-    my $result = versioncmp($ver, $latestversion);
-    my $action =    $result == -1 ? ($ver ? "UPGRADING" : "NEW") :
-                    $result ==  1 ? "DOWNGRADING" :
-                    "up to date";
+    my ($result, $action);
+
+    if ($progtype eq 'application'
+        or $progtype eq 'engine'
+        or $progtype eq 'reconciler')
+    {
+        $result = &majorversioncmp($ver, $latestversion);
+
+        # Ignore major versions that are lower. This lets us maintain branches
+        # of Shepherd; i.e. release a bugfix for a previous version while continuing 
+        # development of a newer version with new dependencies.
+        return 0 if ($result == 1);
+        
+        if ($result == -1 and !$opt->{'update-version'})
+        {
+            &log(ucfirst($progtype) . " $proggy has new major version available: " .
+                 "v$latestversion.\nNot auto-updating. To update, run: $progname " .
+                 "--update-version\n");
+            $result = 0;
+            $action = 'GNORING';
+        }
+    }
+
+    unless ($action)
+    {
+        $result = &versioncmp($ver, $latestversion);
+        $action =    $result == -1 ? ($ver ? "UPGRADING" : "NEW") :
+                     $result ==  1 ? "DOWNGRADING" :
+                                     "up to date";
+    }
     &log(sprintf    "* %-55s%16s\n",
                     ucfirst($progtype) . " $proggy" .
@@ -525 +551 @@
 }
 
+sub majorversioncmp
+{
+    my ($v1, $v2) = @_;
+
+    $v1 =~ /^(\d+)\./ and $v1 = $1;
+    $v2 =~ /^(\d+)\./ and $v2 = $1;
+
+    $v1 <=> $v2;
+}
+
 sub get_full_path
 {
@@ -883 +919 @@
                         nolog
                         check
+                        update-version
                         reset
                      ));
   $debug = $opt->{debug};
+  $opt->{update} = 1 if ($opt->{'update-version'});
 }
 
@@ -1286 +1324 @@
     --update              Update only; don't grab data
 
+    --update-version      Update major version
+
     --check               Check status of all components, configure if necessary
 

status

@@ -1 @@
-application     shepherd            0.3.32
+application     shepherd            0.3.33
 engine          dog                 0.3.13
 grabber         yahoo7widget        1.58-r1