Changeset 33995 for branches/eam_branches/ipp-20120601/psconfig/pscheckmods

Timestamp:

Jun 10, 2012, 6:12:36 AM (14 years ago)

Author:

eugene

Message:

temp mods to get Ubuntu 12.04 working

File:

• branches/eam_branches/ipp-20120601/psconfig/pscheckmods (modified) (4 diffs)

branches/eam_branches/ipp-20120601/psconfig/pscheckmods

@@ -9 +9 @@
 
 if ($VERBOSE) { print STDERR "checking in @INC\n"; }
+
+## XXX EAM $realfilename = "ISO8601.pm";
+## XXX EAM $result = do $realfilename;
+## XXX EAM print "result: $result\n";
+## XXX EAM print "$@\n";
+## XXX EAM exit 2;
 
 # &detailed_require ($ARGV[0]);
@@ -34 +40 @@
     $filename =~ s|::|/|g;
     $filename = "$filename.pm";
-    print "$filename\n";
+    # print "$filename\n";
     if (exists $INC{$filename}) {
         return 1 if $INC{$filename};
@@ -43 +49 @@
       foreach $prefix (@INC) {
           $realfilename = "$prefix/$filename";
-          print "$realfilename\n";
+          # print "real: $realfilename\n";
           if (-f $realfilename) {
               $INC{$filename} = $realfilename;
+              # print "calling 'do' on $realfilename\n";
               $result = do $realfilename;
+              # print "result: $result\n";
+              # exit 4;
               last ITER;
           }
@@ -52 +61 @@
       die "Can't find $filename in \@INC";
     }
+    # print "here 1\n";
     if ($@) {
+        # print "here 2\n";
+        # print "$@";
         $INC{$filename} = undef;
+        # print "here 2a\n";
+        exit 2;
         die $@;
     } elsif (!$result) {
+        # print "here 3\n";
+        # print "no result\n";
+        exit 2;
         delete $INC{$filename};
         die "$filename did not return true value";
     } else {
+        # print "here 4\n";
+        # print "done with detailed_require\n";
+        exit 2;
         return $result;
     }