Skip to contentSkip to conversation

SendErrorReport.py: fix two issues

PATCH New Yi Zhao 1 participant 1 message Apr 27, 2015

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

PATCH 1/1 SendErrorReport.py: fix two issues

Remove undefined $x in command.
Add a missing blank for the -l flag.

---
 .../autobuilder/buildsteps/SendErrorReport.py      |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
lib/python2.7/site-packages/autobuilder/buildsteps/SendErrorReport.py +2 -2
index 34bb02a..2d5f32b 100644
@@ -42,7 +42,7 @@ class SendErrorReport(ShellCommand):
         else:
             if str(os.environ.get('ERROR_REPORT_COLLECT')) == "True":
                 self.command = "if [ ! -f ~/.oe-send-error ]; then host=`hostname`; echo \"yocto-autobuilder-autogenerated-$host\" > ~/.oe-send-error; fi ; "
-                self.command += ". ./oe-init-build-env; if [ -d " + self.errordir +"/$x" + " ]; then for x in `ls " + self.errordir + " | grep error_report_`;"
+                self.command += ". ./oe-init-build-env; if [ -d " + self.errordir + " ]; then for x in `ls " + self.errordir + " | grep error_report_`;"
                 if int(self.layerversion_core) == 4:
                     if os.environ.get('ERROR_REPORT_SERVER') is not None:
                         self.er_server = str(os.environ.get('ERROR_REPORT_SERVER'))
@@ -51,7 +51,7 @@ class SendErrorReport(ShellCommand):
                     self.command += "do send-error-report " + self.errordir +"/$x"+ self.er_server + "; done; fi"
                 elif int(self.layerversion_core) == 5:
                     master = self.build.builder.botmaster.parent
-                    self.er_link = " -l" + master.status.getURLForBuild(self.buildername, self.buildnumber)
+                    self.er_link = " -l " + master.status.getURLForBuild(self.buildername, self.buildnumber)
                     if os.environ.get('ERROR_REPORT_SERVER') is not None:
                         self.er_server = " -s " + str(os.environ.get('ERROR_REPORT_SERVER'))
                     else:
Signature · 1 line
1.7.9.5