Changeset 41583

Timestamp:

May 15, 2021, 8:39:19 AM (5 years ago)

Author:

eugene

Message:

add option to require exact version match

Location:

trunk/psconfig

Files:

• pscheckmods (modified) (3 diffs)
• tagsets/ipp-3.0.perl (modified) (1 diff)

trunk/psconfig/pscheckmods

@@ -7 +7 @@
     shift @ARGV;
 }
-if (@ARGV > 2 && $ARGV[0] eq "-debug") {
-    $DEBUG = 1;
-    shift @ARGV;
-}
-if (@ARGV != 2) { die "USAGE: pscheckmods [-v] [-debug] (module) (version)\n"; }
+if (@ARGV != 2) { die "USAGE: pscheckmods (module) (version)\n"; }
 
 if ($VERBOSE) { print STDERR "checking in @INC\n"; }
@@ -28 +24 @@
 print "$ARGV[0]: $version\n";
 
-if ($ARGV[1] > $version) {
+my $requireExact = 0;
+my $myVersion = $ARGV[1];
+if ($myVersion =~ m|^=.|) {
+    $requireExact = 1;
+    $myVersion =~ s|^=||;
+    print "$ARGV[1], $myVersion\n";
+}
+
+if ($myVersion > $version) {
     print "$ARGV[0] is too old: have $version : need $ARGV[1]\n";
     exit 1;
 }
+
+if ($requireExact && ($myVersion != $version)) {
+    print "$ARGV[0] is not the right version: have $version : need $myVersion\n";
+    exit 1;
+}
+
 
 exit 0;
@@ -49 +59 @@
           print "real: $realfilename\n" if $DEBUG;
           if (-f $realfilename) {
-              print "my filename: $filename\n" if $DEBUG;
               $INC{$filename} = $realfilename;
               print "calling 'do' on $realfilename\n" if $DEBUG;

trunk/psconfig/tagsets/ipp-3.0.perl

@@ -68 +68 @@
   55    IPC::Run                       IPC-Run-0.80.tar.gz                      0              NONE      NONE
   56    Cache                          Cache-2.04.tar.gz                        0              NONE      NONE
-  57    IPC::Cmd                       IPC-Cmd-0.36.tar.gz                      0.36           NONE      NONE
+  57    IPC::Cmd                       IPC-Cmd-0.36.tar.gz                      =0.36           NONE      NONE
   58    SOAP::Lite                     SOAP-Lite-0.69.v1.tar.gz                 0              NONE      yes,yes,no
   59    Log::Log4perl                  Log-Log4perl-1.10.v1.tar.gz              0              NONE      NONE