Changeset 3411

Timestamp:

Jan 25, 2017, 6:34:23 PM (2 years ago)

Author:

jrpelegrina

Message:

Wip in new cli

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

@@ -11 +11 @@
 class LliurexUpCli:
         def __init__(self):
+
                 self.lliurexcore = lliurex.lliurexup.LliurexUpCore()
-
-        
+                self.checkInitialFlavour()
+        
+        def checkInitialFlavour(self):
+
+                self.targetMetapackage=None
+
+                try:
+                        self.targetMetapackage=self.lliurexcore.checkFlavour()
+                        
+                        #if self.targetMetapackage !=None:
+                        self.metapackageRef=self.lliurexcore.metapackageRef
+                        if len(self.metapackageRef)==0:
+                                self.lliurexcore.getTargetMetapackage()
+                        self.metapackageRef=sorted(self.metapackageRef) 
+                         
+                        self.previousFlavours=self.lliurexcore.previuosFlavours
+                        if len(self.previousFlavours)==0:
+                                self.lliurexcore.getPreviuosFlavours()
+                        
+                        log_msg="Get initial flavours: " + str(self.previousFlavours)
+                        self.log(log_msg)
+                  
+                except Exception as e:
+                        print e
+
         def initActionsScript(self):
+
                 command=self.lliurexcore.initActionsScript()
                 try:
@@ -59 +84 @@
         def checkingInitialFlavourToInstall(self):
 
-                print ("Checking flavour")
-
-        def     getPackagesToUpdate(self):
-                self.packages=self.lliurexcore.getPackagesToUpdate()
-
+                if self.targetMetapackage == None:
+                        self.flavourToInstall=self.requiresInstallFlavour()
+                        if self.flavourToInstall != None:
+                                print "  [Lliurex-up]: Installation of flavour is required: " +str(self.flavourToInstall)
+                                is_flavour_installed=self.lliurexcore.installInitialFlavour(self.flavourToInstall)      
+                                returncode=is_flavour_installed['returncode']
+                                error=is_flavour_installed['stderrs']
+                                print "  [Lliurex-up]: Flavour is now installed: " + str(returncode) + " Error: " + str(error)
+                        else:
+                                print "  [Lliurex-up]: Installation of flavour is not required"
+                else:
+                        print "  [Lliurex-up]: Installation of flavour is required: " + str(self.targetMetapackage)
+                        is_flavour_installed=self.lliurexcore.installInitialFlavour(self.targetMetapackage)     
+                        returncode=is_flavour_installed['returncode']
+                        error=is_flavour_installed['stderrs']
+                        print "  [Lliurex-up]: Flavour is now installed: " + str(returncode) + " Error: " + str(error)
+
+        def requiresInstallFlavour(self):
+                
+                flavourToInstall=None
+                
+                self.flavours=self.lliurexcore.flavours
+                if not 'None' in self.previousFlavours:
+                        if self.previousFlavours !=self.flavours:
+                                flavourToInstall=self.parseFlavourToInstall(self.previousFlavours)
+                                                                                        
+                else:
+                        if self.metapackageRef != self.flavours:
+                                flavourToInstall=self.parseFlavourToInstall(self.metapackageRef)
+
+                return flavourToInstall                                         
+                        
+        #def requiresInstallFlavour
+        
+        def parseFlavourToInstall(self,flavours):
+        
+                parse_flavour=""
+
+                for item in flavours:
+                        if item != "edu":
+                                parse_flavour=parse_flavour + " " + "lliurex-meta-" + item
+
+                return parse_flavour            
+
+        def checkingIncorrectFlavours(self):
+                
+                count=0
+                ref_flavour=["lliurex-meta-server","lliurex-meta-client", "lliurex-meta-desktop", "lliurex-meta-music", "lliurex-meta-pyme", "lliurex-meta-infantil"] 
+                self.incorrect_flavours=[]
+
+                for item in self.packages:
+                        if item in ref_flavour:
+                                self.incorrect_flavours.append(item)
+                                
+                if len(self.incorrect_flavours)>0:
+                        for item in self.incorrect_flavours:
+                                if self.targetMetapackage != None:
+                                        if item != self.targetMetapackage:
+                                                count=count+1
+                                else:
+                                        meta=item.split("-")[2]
+                                        if 'None' in self.previousFlavours:
+                                                if not meta in self.metapackageRef:
+                                                        count=count+1
+                                        else:           
+                                                if not meta in self.previousFlavours:
+                                                        count=count+1
+
+                if count>0:
+                        return True
+                else:
+                        return False
 
         def preActionsScript(self):
+
                 command=self.lliurexcore.preActionsScript()
                 try:
@@ -74 +167 @@
 
         def distUpgrade(self):
+
                 command=self.lliurexcore.distUpgradeProcess()
                 try:
@@ -81 +175 @@
 
         def postActionsScript(self):
+
                 command=self.lliurexcore.postActionsScript()
                 try:
@@ -86 +181 @@
                 except Exception as e:
                         print e                                 
-
-
 
         def main(self):
@@ -103 +196 @@
 
                 print("  [Lliurex-up]: Checking if installation of flavour is required")
-                self.checkingInitialFlavourToInstall():
+                self.checkingInitialFlavourToInstall()
 
                 print("  [Lliurex-up]: Checking for new updates")
-                self.getPackagesToUpdate()
+                self.packages=self.lliurexcore.getPackagesToUpdate()
 
                 if len(self.packages)>0:
-                        print("  [Lliurex-up]:List of packages to update")
-                        for item in self.packages:
-                                print item + ": " + packages[item]["candidate"]
-
-                        response=raw_input(' [LLiurex-up]: Do you want to udpate the system(yes/no)): ').lower()
-                        if response.startswith('y'):
-                                print("  [Lliurex-up]: Preparin system to update")
-                                self.preActionsScript()
-                                print("  [Lliurex-up]: Downloading and installing packages")
-                                self.distUpgrade()
-                                print("  [Lliurex-up]: Ending the update")
-                                self.postActionsScript()
-                                print("  [Lliurex-up]: The system is now update")
-
+                        
+                        if not self.checkingIncorrectFlavours():
+                                print("  [Lliurex-up]:List of packages to update")
+                                for item in self.packages:
+                                        print item + ": " + self.packages[item]["candidate"]
+
+                                response=raw_input(' [LLiurex-up]: Do you want to udpate the system(yes/no)): ').lower()
+                                if response.startswith('y'):
+                                        print("  [Lliurex-up]: Preparin system to update")
+                                        self.preActionsScript()
+                                        print("  [Lliurex-up]: Downloading and installing packages")
+                                        self.distUpgrade()
+                                        print("  [Lliurex-up]: Ending the update")
+                                        self.postActionsScript()
+                                        print("  [Lliurex-up]: The system is now update")
+                                        self.lliurexcore.cleanEnvironment()
+
+                                else:
+                                        print("  [Lliurex-up]: Cancel the update")
+                                        self.lliurexcore.cleanEnvironment()
+                                        return 0        
                         else:
-                                return 0                
-
+                                print("[Lliurex-up]: Updated abort for incorrect flavours detected in new update")
                 else:
                         print("  [Lliurex-up]: Your systems is updated. Nothing to do")