Changeset 4069 for lliurex-up

Timestamp:

Mar 29, 2017, 2:53:59 PM (4 years ago)

Author:

jrpelegrina

Message:

WIP in fixed code final error upgrade

Location:

lliurex-up/trunk/fuentes

Files:

• lliurex-up-cli/usr/sbin/lliurex-upgrade (modified) (5 diffs)
• python-lliurex-up/lliurex/lliurexup/__init__.py (modified) (2 diffs)

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

@@ -203 +203 @@
                         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)
+                        print "  [Lliurex-up]: Metapackage is now installed: Returncode: " + str(self.returncode_initflavour) + " Error: " + str(error)
                         
         #def checkingInitialFlavourToInstall            
@@ -300 +300 @@
         def postActionsScript(self,extra_args):
 
+                self.postActionsError=False
                 print("  [Lliurex-up]: Ending the update")
 
                 if extra_args["unattendend_upgrade"]:
-                        command="DEBIAN_FRONTEND=noninteractive " + self.lliurexcore.postActionsScript()+'| tee ' + self.lliurexcore.errorpostaction_token
-                else:
-                        command=self.lliurexcore.postActionsScript()+'| tee ' + self.lliurexcore.errorpostaction_token
+                        command="DEBIAN_FRONTEND=noninteractive " + self.lliurexcore.postActionsScript()
+                else:
+                        command=self.lliurexcore.postActionsScript()
         
                 try:
-                        subprocess.Popen(command,shell=True).communicate()
+                        p=subprocess.Popen(command,shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+                        poutput,perror=p.communicate()
+                        if len(perror)>0:
+                                self.postActionsError=True
+                                log_msg="Exec Post-Actions. Error: " + str(perror)
+                        else:
+                                log_msg="Exec Post-Actions. OK: "       
                         #os.system(command)
-                        log_msg="Exec Post-Actions"
-                        self.log(log_msg)
+                        #log_msg="Exec Post-Actions"
+                        self.log(log_msg)
+
                 except Exception as e:
                         print e
@@ -320 +328 @@
         def checkingFinalFlavourToInstall(self):
                 
+                self.finalFlavourError=False
                 print("  [Lliurex-up]: Checking final metapackage")
 
@@ -332 +341 @@
                         
                         command=self.lliurexcore.installFinalFlavour(self.flavourToInstall)
-                        try:
-                                #os.system(command)
-                                subprocess.Popen(command,shell=True).communicate()
-
-                        except Exception as e:
-                                print e
+                        p=subprocess.Popen(command,shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+                        poutput,perror=p.communicate()
+
+                        if len(perror)>0:
+                                self.finalFlavourError=True
+                                log_msg=" Metapackage installation. Error: " + str(self.perror)
+                                print ("  [Lliurex-up]: Metapackage installation. Error:" + str(self.perror))
+                        else:
+                                log_msg=" Metapackage installation. OK"
+                                print ("  [Lliurex-up]: Metapackage installation. OK")
+
+                        self.log(log_msg)       
+                                        
                 else:
                         print ("  [Lliurex-up]: Metapackage is correct. Nothing to do")
@@ -348 +364 @@
                 error=self.lliurexcore.checkErrorDistUpgrade()
 
-                if error:
+                if error or self.postActionsError or self.finalFlavourError:
                         print("  [Lliurex-up]: The updated process is endend with errors")
                         log_msg="Dist-upgrade process ending with errors"

lliurex-up/trunk/fuentes/python-lliurex-up/lliurex/lliurexup/__init__.py

@@ -24 +24 @@
                 self.previousflavourspath = os.path.join(self.processPath,'previousflavours')
                 self.errorpostaction_token=os.path.join(self.processPath,'errorpostaction_token')
+                self.errorfinalmetapackage_token=os.path.join(self.processPath,'errorfinalmetapackage_token')
                 self.errorupgrade_token=os.path.join(self.processPath,'errorupgrade_token')
                 self.finalupgrade_token=os.path.join(self.processPath,'finalupgrade_token')
@@ -442 +443 @@
                 p = subprocess.Popen(command,shell=True,stdout=subprocess.PIPE)
                 poutput,perror = p.communicate()
+                
+                if p.returncode!=0:
+                        command = "LANG=C LANGUAGE=en DEBIAN_FRONTEND=noninteractive apt-get install -f -y --force-yes {options} ".format(options=options)
+                        p = subprocess.Popen(command,shell=True,stdout=subprocess.PIPE)
+                        poutput,perror = p.communicate()
+
+
                 return {'returncode':p.returncode,'stdout':poutput,'stderrs':perror}