[Sisuite-devel] Server.pm use strict patch

[Sean Dague]

Attached is a patch which makes lib/SystemImager/Server.pm mostly work under
the 'use strict' stanza in the unstable-2_1_x branch.  I still get the
following syntax check errors as these variables aren't passed defined
anywhere that I can find in the code, and hence will always be blank (which
I really don't think is supposed to be the case).

rigel:~/SIS/systemimager-2.1.x> perl -c lib/SystemImager/Server.pm
Global symbol "$systemimagerdir" requires explicit package name at
lib/SystemImager/Server.pm line 558.
Global symbol "$program_name" requires explicit package name at
lib/SystemImager/Server.pm line 578.
Global symbol "$program_name" requires explicit package name at
lib/SystemImager/Server.pm line 614.
Global symbol "$program_name" requires explicit package name at
lib/SystemImager/Server.pm line 1104.
Global symbol "$ssh_user" requires explicit package name at
lib/SystemImager/Server.pm line 1158.
lib/SystemImager/Server.pm had compilation errors.

        -Sean

-- 
_______________________________________________________________________
                                
Sean Dague                [EMAIL PROTECTED]               http://dague.net

There is no silver bullet.  Plus, werewolves make better neighbors than
zombies, and they tend to keep the vampire population down.
_______________________________________________________________________

Index: lib/SystemImager/Server.pm
===================================================================
RCS file: /cvsroot/systemimager/systemimager/lib/SystemImager/Server.pm,v
retrieving revision 1.9.4.1.2.54
diff -u -r1.9.4.1.2.54 Server.pm
--- lib/SystemImager/Server.pm  3 Aug 2002 03:11:18 -0000       1.9.4.1.2.54
+++ lib/SystemImager/Server.pm  7 Aug 2002 20:57:40 -0000
@@ -9,6 +9,8 @@
 
 package SystemImager::Server;
 
+use strict;
+use vars qw($VERSION @mount_points %device_by_mount_point 
+%filesystem_type_by_mount_point);
 use Carp;
 use XML::Simple;
 use File::Path;
@@ -361,7 +363,7 @@
             # $flags{$m} will look something like "boot,lba,raid" or "boot" at this 
point.
             my @flags = split (/,/, $flags{$m});
 
-            foreach $flag (@flags) {
+            foreach my $flag (@flags) {
               # Parted 1.6.0 doesn't seem to want to tag gpt partitions with lba.  
Hmmm. -BEF-
               if (($flag eq "lba") and ($label_type eq "gpt")) { next; }
               $cmd = "parted -s -- $dev set $m $flag on || shellout\n";
@@ -731,7 +733,8 @@
 
 
     foreach my $line (sort numerically (keys ( %{$config->{fsinfo}} ))) {
-
+        
+        my $cmd = "";
         # If this line is a comment, skip over. -BEF-
         if ( $config->{fsinfo}->{$line}->{comment} ) { next; }
 
@@ -1016,7 +1019,7 @@
     # -BEF-
     #
     foreach my $mp (reverse sort (keys ( %fs_by_mp ))) {
-
+       
         my $fs = $fs_by_mp{$mp};
         unless( 
                 ($fs eq "ext2") 
@@ -1027,7 +1030,7 @@
         ) { next; }
 
         # umount
-        $cmd = "umount /a$mp || shellout";
+        my $cmd = "umount /a$mp || shellout";
         print MASTER_SCRIPT qq(echo "$cmd"\n);
         print MASTER_SCRIPT "$cmd\n";
         print MASTER_SCRIPT "\n";

msg00012/pgp00000.pgp
Description: PGP signature