Changeset 42758

Timestamp:

Dec 6, 2024, 1:32:02 PM (20 months ago)

Author:

eugene

Message:

merge from trunk

Location:

branches/eam_branches/ipp-20230313/psconfig

Files:

• . (modified) (1 prop)
• pscheckmods (modified) (3 diffs)
• tagsets/ipp-gentoo.dist (modified) (1 diff)
• tagsets/ipp-ubuntu.dist (modified) (1 diff)
• tagsets/ipp-ubuntu.perl (modified) (1 diff)

branches/eam_branches/ipp-20230313/psconfig/pscheckmods

@@ -3 +3 @@
 $DEBUG = 0;
 $VERBOSE = 0;
+if (@ARGV > 2 && $ARGV[0] eq "-v") {
+    $VERBOSE = 1;
+    shift @ARGV;
+}
+if (@ARGV > 2 && $ARGV[0] eq "-debug") {
+    $DEBUG = 1;
+    shift @ARGV;
+}
 if (@ARGV > 2 && $ARGV[0] eq "-v") {
     $VERBOSE = 1;
@@ -55 +63 @@
     my ($realfilename,$result);
   ITER: {
+      my $found = 0;
       foreach $prefix (@INC) {
           $realfilename = "$prefix/$filename";
-          print "real: $realfilename\n" if $DEBUG;
+          print "try: $realfilename\n" if $DEBUG;
           if (-f $realfilename) {
               $INC{$filename} = $realfilename;
@@ -63 +72 @@
               $result = do $realfilename;
               print "result: $result\n" if $DEBUG;
-              last ITER;
+              if (! $DEBUG) { last ITER; }
+              $found = 1;
           }
       }
-      die "Can't find $filename in \@INC";
+      if (!$found) { die "Can't find $filename in \@INC"; }
     }
     if ($@) {

branches/eam_branches/ipp-20230313/psconfig/tagsets/ipp-gentoo.dist

@@ -64 +64 @@
   YYYYY  pstamp                 ipp-2-9          -0
   YYYYY  ippTools               ipp-2-9          -0
+  YYYYY  ippconfig              ipp-2-9          -0
   YYYYY  ippScripts             ipp-2-9          -0
   YYYYY  ippTasks               ipp-2-9          -0
 # YNYYY  ippToPsps              ipp-2-9          -0 : moved to $svn/psps
           
-  YYYYY  ippconfig              ipp-2-9          -0
   YNYYN  psconfig               ipp-2-9          -0
   YNYYN  ippMonitor             ipp-2-9          -0

branches/eam_branches/ipp-20230313/psconfig/tagsets/ipp-ubuntu.dist

@@ -66 +66 @@
   YYYYY  pstamp                 ipp-2-9          -0
   YYYYY  ippTools               ipp-2-9          -0
+  YYYYY  ippconfig              ipp-2-9          -0
   YYYYY  ippScripts             ipp-2-9          -0
   YYYYY  ippTasks               ipp-2-9          -0
 # YNYYY  ippToPsps              ipp-2-9          -0 : moved to $svn/psps
           
-  YYYYY  ippconfig              ipp-2-9          -0
   YNYYN  psconfig               ipp-2-9          -0
   YNYYN  ippMonitor             ipp-2-9          -0

branches/eam_branches/ipp-20230313/psconfig/tagsets/ipp-ubuntu.perl

@@ -34 +34 @@
   01  Class::Prototyped             Class-Prototyped-1.13.tar.gz             0              NONE      NONE
   01  Class::Singleton              Class-Singleton-1.5.tar.gz               0              NONE      NONE
+  01  Encode::Locale                Encode-Locale-1.05.tar.gz                0              NONE      NONE
   01  Data::Dump                    Data-Dump-1.23.tar.gz                    0              NONE      NONE
   01  Data::Validate::Domain        Data-Validate-Domain-0.14.tar.gz         0              NONE      NONE