Changeset 3514 for lliurex-up/trunk/fuentes/lliurex-up-cli

Timestamp:

Feb 2, 2017, 2:45:14 PM (3 years ago)

Author:

jrpelegrina

Message:

Fix code

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

@@ -89 +89 @@
         def checkingInitialFlavourToInstall(self):
 
+                self.returncode_initflavour=0
 
                 if self.targetMetapackage == None:
@@ -110 +111 @@
                         self.returncode_initflavour=is_flavour_installed['returncode']
                         error=is_flavour_installed['stderrs']
-                        log_msg="Install initial flavour:" + self.targetMetapackage + ": Returncode: " + str(self.returncode_initflavour) + " Error: " + str(error)
-                        self.log(log_msg)
-                        print "  [Lliurex-up]: Metapackage is now installed: " + str(returncode) + " Error: " + str(error)
+                        log_msg="Install initial metapackage:" + self.targetMetapackage + ": Returncode: " + str(self.returncode_initflavour) + " Error: " + str(error)
+                        self.log(log_msg)
+                        print "  [Lliurex-up]: Metapackage is now installed: " + str(self.returncode_initflavour) + " Error: " + str(error)
 
         
@@ -183 +184 @@
                                 print e
                 else:
-                        print ("  [Lliurex-up]: metapackage is correct. Nothing to do")
+                        print ("  [Lliurex-up]: Metapackage is correct. Nothing to do")
 
 
@@ -248 +249 @@
                 self.log(log_msg)
 
-                print("  [Lliurex-up]: Checking if installation of flavour is required")
+                print("  [Lliurex-up]: Checking if installation of metapackage is required")
                 self.checkingInitialFlavourToInstall()
 
@@ -271 +272 @@
                                         print("  [Lliurex-up]: Ending the update")
                                         self.postActionsScript()
-                                        print("  [Lliurex-up]: Checking Final Flavour")
+                                        print("  [Lliurex-up]: Checking final metapackage")
                                         self.checkingFinalFlavourToInstall()    
                                         self.checkFinalUpgrade()
@@ -285 +286 @@
                                 if not self.checkPreviousUpgrade():
                                         print("  [Lliurex-up]: Your systems is updated. Nothing to do")
+                                        self.lliurexcore.cleanEnvironment()
                                         return 0
                                 else:
                                         print("  [Lliurex-up]: Updated abort. An error occurred checking new updates")
+                                        self.lliurexcore.cleanEnvironment()
                                         return 1
                 else:
                         print("[Lliurex-up]: Updated abort for incorrect flavours detected in new update")
+                        self.lliurexcore.cleanEnvironment()
+
                         return 1