From 1a157acdcbbeeae8f8bb5fd7d240bd9542bd937f Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 13 Nov 2008 23:37:59 +0000
Subject: (main): do max $rev computation correctly (hopefully).

git-svn-id: svn://tug.org/texlive/trunk@11291 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/tlpkg/bin/tl-update-nsis | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'Master/tlpkg/bin')

diff --git a/Master/tlpkg/bin/tl-update-nsis b/Master/tlpkg/bin/tl-update-nsis
index 962be7c47d4..a1acbd56ebc 100755
--- a/Master/tlpkg/bin/tl-update-nsis
+++ b/Master/tlpkg/bin/tl-update-nsis
@@ -50,24 +50,19 @@ sub main
   push @allfiles, $texliveinfra->all_files;
   push @allfiles, $texliveinfraw32->all_files if defined $texliveinfraw32;
   
-  # get highest rev of all these packages.
-  my $rev = $bintexlive->revision;
-  if (defined($bintexlivew32)) {
-    $rev = $bintexlivew32->revision if $rev > $bintexlivew32->revision;
-  }
-  $rev = $texliveinfra->revision if $rev > $texliveinfra->revision;
-  if (defined($texliveinfraw32)) {
-    $rev = $texliveinfraw32->revision if $rev > $texliveinfraw32->revision;
-  }
-  # we have to create the tlpobj files, too
+  # create the tlpobj files
   my $tlpobjdir = "$InfraLocation/tlpobj";
   my $removetlpobjdir = 0;
   if (! -d "$Master/$tlpobjdir") {
     &TeXLive::TLUtils::mkdirhier("$Master/$tlpobjdir");
     $removetlpobjdir = 1;
   }
+  my $rev = 0; # we want the highest rev all these packages.
   for my $p ($bintexlive, $bintexlivew32, $texliveinfra, $texliveinfraw32) {
     if (defined $p) {
+      if ($p->revision > $rev) {
+        $rev = $p->revision;
+      }
       open(TMP,">$Master/$tlpobjdir/$p->{'name'}.tlpobj") or die "Cannot create $Master/$tlpobjdir/$p->{'name'}.tlpobj";
       $p->writeout(\*TMP);
       close(TMP);
-- 
cgit v1.2.3