#i119732# Added alternative to fetch_tarballs.sh.

bootstrap.1

@@ -39,7 +39,11 @@ chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl"
 
 # fetch or update external tarballs
 if [ "$DO_FETCH_TARBALLS" = "yes" ]; then
-	$SRC_ROOT/fetch_tarballs.sh $SRC_ROOT/ooo.lst
+  if [ "X$USE_NEW_EXTLIB_DOWNLOAD" != "X" ]; then
+      download_external_libraries.pl $SRC_ROOT/external_libs.lst
+  else
+	  $SRC_ROOT/fetch_tarballs.sh $SRC_ROOT/ooo.lst
+  fi
 fi
 
 # ------------------------------------------------------------------------------

solenv/bin/modules/ExtensionsLst.pm

@@ -268,7 +268,7 @@ sub EvaluateSelector($$)
             return $left_result || $right_result;
         }
     }
-    elsif ($expression =~ /^\s*(.+?)\s$/)
+    elsif ($expression =~ /^\s*(.+?)\s*$/)
     {
         return EvaluateTerm($1, $languages);
     }