Changeset 4637

Timestamp:

May 9, 2017, 1:50:41 PM (4 years ago)

Author:

jrpelegrina

Message:

Fixed lliurex-upgrade to add return 0 when process is ok

File:

• lliurex-up/trunk/fuentes/lliurex-up-cli/usr/sbin/lliurex-upgrade (modified) (6 diffs)

lliurex-up/trunk/fuentes/lliurex-up-cli/usr/sbin/lliurex-upgrade

@@ -440 +440 @@
                                         self.errorfinalmetapackage=True
                                         log_msg="Install of metapackage. Error:%s"%e
+
+                                self.log(log_msg)       
                                         
                                                         
@@ -448 +450 @@
                         self.errorfinalmetapackage=True
                         log_msg="Final check metapackage. Error:%s"%e   
-                                
-                self.log(log_msg)       
+                        self.log(log_msg)       
                         
         #def checkingFinalFlavourToInstall              
@@ -455 +456 @@
         def checkFinalUpgrade(self):
 
+
                 print("  [Lliurex-up]: Checking Dist-upgrade ")
                 error=self.lliurexcore.checkErrorDistUpgrade()
@@ -461 +463 @@
                         print("  [Lliurex-up]: The updated process is endend with errors")
                         log_msg="Dist-upgrade process ending with errors"
+                        self.distUpgrade_OK=False
                 
                 else:                                   
                         print("  [Lliurex-up]: The system is now update")       
                         log_msg="Dist-upgrade process ending OK"
+                        self.distUpgrade_OK=True
+
                 
                 self.log(log_msg)
@@ -472 +477 @@
         def handler_signal(self,signal,frame):
                 
-                print("\n  [Lliurex-up]: Cancel process with Ctr+c signal")
-                log_msg="Cancel process with Ctr+c signal"
+                print("\n  [Lliurex-up]: Cancel process with Ctrl+C signal")
+                log_msg="Cancel process with Ctrl+C signal"
                 self.log(log_msg)
                 self.lliurexcore.cleanEnvironment()
                 self.lliurexcore.cleanLliurexUpLock()
-                sys.exit(1)
+                sys.exit(0)
         
         #def handler_signal
@@ -552 +557 @@
                                         self.lliurexcore.cleanEnvironment()
                                         self.lliurexcore.cleanLliurexUpLock()
+                                        if self.distUpgrade_OK:
+                                                return 0
+                                        else:
+                                                return 1