Changeset 2734 for lliurex-up/trunk/fuentes/LliurexUpCore.py

Timestamp:

Oct 31, 2016, 6:30:30 PM (4 years ago)

Author:

kbut

Message:

wip

File:

• lliurex-up/trunk/fuentes/LliurexUpCore.py (modified) (3 diffs)

lliurex-up/trunk/fuentes/LliurexUpCore.py

@@ -3 +3 @@
 import shutil
 import subprocess
+import socket
 
 class LliurexUpCore(object):
@@ -49 +50 @@
         def checkLliurexUpIsUpdated(self):
                 sourceslistDefaultPath = os.path.join(self.processSourceslist,'default')
-                options = "-o Dir::Etc::sourcelist={sourceslistOnlyLliurex} -o Dir::Etc::sourceparts=/dev/null".format(sourceslistOnlyLliurex=sourceslistDefaultPath)
+                options = ""
+                if self.canConnectToLliurexNet():
+                        options = "-o Dir::Etc::sourcelist={sourceslistOnlyLliurex} -o Dir::Etc::sourceparts=/dev/null".format(sourceslistOnlyLliurex=sourceslistDefaultPath)
                 command = "LANG=C apt-get update {options}".format(options=options)
                 subprocess.Popen(command,shell=True).communicate()
                 result = self.getPackageVersionAvailable('lliurex-up',options)
+
                 if result['installed'] != result['candidate']:
-                        command = "LANG=C apt-get install lliurex-up {options}".format(options=options)
-                        p = subprocess.Popen(command,shell=True,stdout=subprocess.PIPE)
-                        p.communicate()
-                        return "reboot"
+                        return "install"
                 return "nothing"
 
+        def installLliurexUp(self):
+                command = "LANG=C apt-get install lliurex-up {options}".format(options=options)
+                p = subprocess.Popen(command,shell=True,stdout=subprocess.PIPE)
+                p.communicate()
 
         def lliurexMirrorIsUpdated(self):
@@ -94 +99 @@
                                 if targetMetapackage != '':
                 return targetMetapackage
+
+        def canConnectToLliurexNet(self):
+                s =  socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                host = socket.gethostbyname('lliurex.net')
+                result = s.connect_ex((host, 80))
+                s.close()
+                if result:
+                        return False
+                return True
+
+        def getLliurexVersion(self):
+                sourceslistDefaultPath = os.path.join(self.processSourceslist,'default')
+                options = ""
+                if self.canConnectToLliurexNet():
+                        options = "-o Dir::Etc::sourcelist={sourceslistOnlyLliurex} -o Dir::Etc::sourceparts=/dev/null".format(sourceslistOnlyLliurex=sourceslistDefaultPath)
+                command = "LANG=C apt-get update {options}".format(options=options)
+                subprocess.Popen(command,shell=True).communicate()
+                return self.getPackageVersionAvailable('lliurex-version-stamp',options)
+
+        def getPackagesToUpdate(self):
+                packageInfo = {}
+                subprocess.Popen("LANG=C apt-get update",shell=True).communicate()
+                p = subprocess.Popen('LANG=C apt-get dist-upgrade -sV',shell=True,stdout=subprocess.PIPE)
+                z = p.stdout.readlines()
+                y = [ x.strip() for x in z if x.startswith('Inst') ]
+                r = [ w.replace('Inst ','') for w in y ]
+                for allinfo in r :
+                        packageInfo[allinfo.split(' ')[0]] = ' '.join(allinfo.split(' ')[1:])
+                
+
+