Changeset 4073 for lliurex-up

Timestamp:

Mar 29, 2017, 6:10:00 PM (3 years ago)

Author:

jrpelegrina

Message:

WIP in improve lliurex-upgrade

File:

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

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

@@ -86 +86 @@
                 try:
                         #os.system(command)
-                        subprocess.Popen(command,shell=True).communicate()
-                        log_msg="Exec Init-Actions"
-                        self.log(log_msg)       
+                        p=subprocess.Popen(command,shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+                        poutput,perror=p.communicate()
+                        if len(perror)>0:
+                                log_msg="Exec Init-Actions. Error: " +str(error)
+                                print ("  [Lliurex-up]: Checking system.  Error: " + str(self.perror))
+                        else:
+                                log_msg="Exec Init-Actionss. OK"
+                                print ("  [Lliurex-up]: Checking system. OK")
+
+                        self.log(log_msg)
+                        
                 except Exception as e:
                         log_msg="Exec Init-Actions.Error: " +str(e)
@@ -265 +273 @@
                 try:
                         #os.system(command)
-                        subprocess.Popen(command,shell=True).communicate()
-                        log_msg="Exec Pre-Actions"
+                        p=subprocess.Popen(command,shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+                        poutput,perror=p.communicate()
+                        if len(perror)>0:
+                                log_msg="Exec Pre-Actions. Error: " +str(error)
+                                print ("  [Lliurex-up]: Preparing system to update.  Error: " + str(self.perror))
+                        else:
+                                log_msg="Exec Pre-Actions. OK"
+                                print ("  [Lliurex-up]: Preparing system to update. OK")
+
                         self.log(log_msg)
 
@@ -287 +302 @@
                 try:
                         #os.system(command)
-                        subprocess.Popen(command,shell=True).communicate()
-                        log_msg="Exec Dist-uggrade"
-                        self.log(log_msg)
+                        p=subprocess.Popen(command,shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+                        poutput,perror=p.communicate()
+                        if len(perror)>0:
+                                log_msg="Exec Dist-uggrade. Error: " +str(error)
+                                print ("  [Lliurex-up]: Downloading and installing packages.  Error: " + str(self.perror))
+                        else:
+                                log_msg="Exec Dist-uggrade. OK"
+                                print ("  [Lliurex-up]: Downloading and installing packages. OK")
+
+                        self.log(log_mg)        
+                        
                 
                 except Exception as e:
@@ -314 +337 @@
                                 self.postActionsError=True
                                 log_msg="Exec Post-Actions. Error: " + str(perror)
-                        else:
-                                log_msg="Exec Post-Actions. OK: "       
+                                print ("  [Lliurex-up]: Metapackage installation. Error: " + str(self.perror))
+                        else:
+                                log_msg="Exec Post-Actions. OK" 
+                                print ("  [Lliurex-up]: Metapackage installation. OK")
+
                         #os.system(command)
                         #log_msg="Exec Post-Actions"
@@ -340 +366 @@
                         print ("  [Lliurex-up]: Install of metapackage is required: " + str(self.flavourToInstall))
                         
-                        command=self.lliurexcore.installFinalFlavour(self.flavourToInstall)
+                        if extra_args["unattendend_upgrade"]:
+                                command="DEBIAN_FRONTEND=noninteractive " +command=self.lliurexcore.installFinalFlavour(self.flavourToInstall)
+                        else:
+                                command=self.lliurexcore.installFinalFlavour(self.flavourToInstall)
+
                         p=subprocess.Popen(command,shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
                         poutput,perror=p.communicate()
@@ -347 +377 @@
                                 self.finalFlavourError=True
                                 log_msg=" Metapackage installation. Error: " + str(self.perror)
-                                print ("  [Lliurex-up]: Metapackage installation. Error:" + str(self.perror))
+                                print ("  [Lliurex-up]: Metapackage installation. Error: " + str(self.perror))
                         else:
                                 log_msg=" Metapackage installation. OK"
@@ -474 +504 @@
                 else:
                         if not self.checkPreviousUpgrade():
-                                print("  [Lliurex-up]: Your systems is updated. Nothing to do")
+                                print("  [Lliurex-up]: Your system is updated. Nothing to do")
                                 self.lliurexcore.cleanEnvironment()
                                 self.lliurexcore.cleanLliurexUpLock()