[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-183-gc135720

[Fabien M <fa...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  c1357200e0901c9026592c0909d208021fa5c454 (commit)
       via  22cc25fe19187e192ef514dd8c09c1655b1701ed (commit)
      from  8e7a8de3f5f0956a37b417024cad9fa7fce8a771 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c1357200e0901c9026592c0909d208021fa5c454
Merge: 22cc25f 8e7a8de
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Mar 20 18:41:29 2012 +0100

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 22cc25fe19187e192ef514dd8c09c1655b1701ed
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Mar 20 18:41:14 2012 +0100

    [software][uboot_recover] Don't use TAB in python code

-----------------------------------------------------------------------

Summary of changes:
 software/uboot_recover/apf28_recover.py |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/software/uboot_recover/apf28_recover.py b/software/uboot_recover/apf28_recover.py
index a90c53b..67b410c 100644
--- a/software/uboot_recover/apf28_recover.py
+++ b/software/uboot_recover/apf28_recover.py
@@ -98,13 +98,13 @@ class UBoot:
         time.sleep(1)
         self.serial.write("\n")
         ret = self.__getOutput()
-	self.serial.flushInput()
+        self.serial.flushInput()
         return ret
 
     def flash(self):
         """ Ask U-Boot to flash itself """
         time.sleep(1)
-	self.serial.flushInput()
+        self.serial.flushInput()
         self.serial.write("run flash_uboot\n")
         try:
             ret = self.__getOutput()
@@ -119,7 +119,7 @@ class UBoot:
     def reset(self):
         """ Ask U-Boot to flash itself """
         time.sleep(1)
-	self.serial.flushInput()
+        self.serial.flushInput()
         self.serial.write("reset\n")
         try:
             ret = self.__getOutput()
@@ -166,7 +166,7 @@ if __name__ == "__main__":
         ser = serial.Serial(port, SPEED, timeout=4)
     except Exception, msg:
         print "Unable to open serial port %s !" % port
-	print msg
+        print msg
         sys.exit()
     ser.flush()
 
@@ -185,9 +185,9 @@ if __name__ == "__main__":
         os.system(ELFTOSB_APP + " -zdf imx28 -c apf28-u-boot_recover.bd -o " + NAND_BINARY)
     except Exception, msg:
         print "Failed to build build NAND image filet !"
-	print msg
-	os.remove(NAND_BINARY);
-	os.remove(ENV_RECOVER);
+        print msg
+        os.remove(NAND_BINARY);
+        os.remove(ENV_RECOVER);
         sys.exit()
 
     print "Downloading NAND image file %s.." % NAND_BINARY
@@ -195,9 +195,9 @@ if __name__ == "__main__":
         os.system(USB_DOWNLOAD_APP + " -f " + NAND_BINARY)
     except Exception, msg:
         print "Failed to upload NAND image file to the target !"
-	print msg
-	os.remove(NAND_BINARY);
-	os.remove(ENV_RECOVER);
+        print msg
+        os.remove(NAND_BINARY);
+        os.remove(ENV_RECOVER);
         sys.exit()
 
     os.remove(NAND_BINARY);
@@ -211,7 +211,7 @@ if __name__ == "__main__":
         os.system(USB_DOWNLOAD_APP + " -f " + BINARY)
     except Exception, msg:
         print "Failed to upload image file to the target !"
-	print msg
+        print msg
         sys.exit()
 
     uboot.waitForPrompt()


hooks/post-receive
-- 
armadeus