diff options
| -rwxr-xr-x | getallpkginfo.bash | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/getallpkginfo.bash b/getallpkginfo.bash index 2aa665c..2f5c12d 100755 --- a/getallpkginfo.bash +++ b/getallpkginfo.bash @@ -64,6 +64,8 @@ if [ -n "$3" ]; then else drawchart="$3" fi +else + drawchart="none" fi @@ -215,7 +217,7 @@ fi cd $PokyHome #Checkout to master -USE_MASTER="master" +#USE_MASTER="master" if [ -n "$USE_MASTER" ]; then git checkout master git pull -f git://git.yoctoproject.org/poky.git master:master >> $Log 2>&1 @@ -346,6 +348,8 @@ if [ "$drawchart" = "drawchart" ]; then else echo "REPORT-SYSTEM-UPDATE ERROR: Didn't draw chart because some failures happend before" >> $Log fi +else + drawchart_result=1 fi @@ -381,7 +385,7 @@ python checklog.py if [ $? -eq 0 ]; then #Send report mail, divide into two conditions, with chart as an attachment or without chart if [ -n "$sendemailto" ]; then - if [ $drawchart_result -eq 0 ]; then + if [ "$drawchart" = "drawchart" -a "$drawchart_result" -eq 0 ]; then sendreportmail_upgrade "upgradecontent.log" "$sendemailto" else sendreportmail_upgrade_no_chart "upgradecontent.log" "$sendemailto" @@ -391,7 +395,7 @@ if [ $? -eq 0 ]; then echo "REPORT-SYSTEM-UPDATE ERROR: Send reportmail faild!" >> $Log fi else - if [ $drawchart_result -eq 0 ]; then + if [ "$drawchart" = "drawchart" -a "$drawchart_result" -eq 0 ]; then sendreportmail_upgrade "upgradecontent.log" "yocto@linux.intel.com" else sendreportmail_upgrade_no_chart "upgradecontent.log" "yocto@linux.intel.com" |