From de963716117001783e2d9e9f22916724b7bd6e06 Mon Sep 17 00:00:00 2001 From: George Milescu Date: Mon, 16 Aug 2010 17:17:38 +0200 Subject: [PATCH] Fixed run_scenario to create matrix files only then there are up-down log files; Fixed tribler call in show_version Signed-off-by: George Milescu --- ControlScripts/run_scenario.sh | 12 +++++++----- Utils/show_version.sh | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ControlScripts/run_scenario.sh b/ControlScripts/run_scenario.sh index 3aa9467..7c204e9 100755 --- 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 50bce15..cb8bebf 100755 --- 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 -- 2.20.1