Fixed run_scenario to create matrix files only then there are up-down log files;...

Signed-off-by: George Milescu <george.milescu@gmail.com>

diff --git a/ControlScripts/run_scenario.sh b/ControlScripts/run_scenario.sh
index 3aa9467b1ebceaa97f5ecb52682548a23e3d1817..7c204e95d7f5c2a286f438140c7326680a01b192 100755 (executable)
--- a/ControlScripts/run_scenario.sh
+++ b/ControlScripts/run_scenario.sh
@@ -257,12 +257,14 @@ scenario_parse() {
        done < $TMP_FILE
        unset IFS
 
-       echo " ** Parsing peer-conection up/down files"
-       if ! ./parse_up_down_log.sh $SCENARIO_RESULTS_FOLDER; then
-               echo "Error parsing updown files in $SCENARIO_RESULTS_FOLDER"
-               exit 1
+       if ls -lR | grep "\.updown" &> /dev/null; then
+               # There are .updown log files
+               echo " *** Parsing peer-conection up/down files"
+               if ! ./parse_up_down_log.sh $SCENARIO_RESULTS_FOLDER; then
+                       echo "Error parsing updown files in $SCENARIO_RESULTS_FOLDER"
+                       exit 1
+               fi
        fi
-
        echo "---------------------- _scenario_parse" >> $ERR_LOG
 }
 

diff --git a/Utils/show_version.sh b/Utils/show_version.sh
index 50bce1512878c066b76e6260c21bdd098cc56859..cb8bebf6bf45bc89d182fdaa085d1d4141b8689b 100755 (executable)
--- a/Utils/show_version.sh
+++ b/Utils/show_version.sh
@@ -19,4 +19,4 @@ export PYTHONPATH=$PYTHONPATH:.
 
 cd $TRIBLER_UTIL_REL_PATH
 
-python Tribler/Tools/cmdlinedl.py -v
+python2.6 Tribler/Tools/cmdlinedl.py -v