[Swift-commit] r7416 - trunk/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-12-11 17:13:46 -0600 (Wed, 11 Dec 2013)
New Revision: 7416

Modified:
   trunk/bin/swiftrun
Log:
Disable app wildcards if app locations are specified


Modified: trunk/bin/swiftrun
===================================================================
--- trunk/bin/swiftrun	2013-12-11 22:55:11 UTC (rev 7415)
+++ trunk/bin/swiftrun	2013-12-11 23:13:46 UTC (rev 7416)
@@ -190,8 +190,8 @@
 # Write apps to file in tc.data format
 sub write_apps {
    my $app_filename = $_[0];
+   my $use_wildcard = 1;
    open( APP_FILE, ">$run_directory/$app_filename" ) || &swiftquit("Unable to open $run_directory/$app_filename");
-   print APP_FILE "* * * INSTALLED INTEL32::LINUX null\n";
 
    # Find app definitions
    while( my( $key, $value ) = each( %properties ) ) {
@@ -200,6 +200,7 @@
 
          # Handle wildcards for site names
          if ( $site eq "*" ) { 
+            $use_wildcard=0;
             foreach my $nsite( @sites ) {
                print APP_FILE "$nsite $command $value\n";
             }
@@ -207,11 +208,17 @@
 
          # Handle apps for defined sites
          elsif ( grep( /^$site$/, @sites ) ) {
+            $use_wildcard=0;
             print APP_FILE "$site $command $value\n";
          }
       }
    }
-   # Update command line args
+
+   if ($use_wildcard) {
+      print APP_FILE "* * * INSTALLED INTEL32::LINUX null\n";
+   }
+
+   close(APP_FILE);
    push( @new_swift_args, "-tc.file $run_directory/$app_filename" );
 }