Changeset 2932 for lliurex-up/trunk

Timestamp:

Nov 25, 2016, 3:04:08 PM (3 years ago)

Author:

kbut

Message:

add script to generate changelogs in pool

Location:

lliurex-up/trunk/fuentes

Files:

• LliurexUpCore.py (modified) (4 diffs)
• LliurexUpForPool.sh (added)
• lliurex-up-gui/LliurexUpCore.py (modified) (10 diffs)

lliurex-up/trunk/fuentes/LliurexUpCore.py

@@ -15 +15 @@
                 self.n4d = xmlrpclib.ServerProxy('https://localhost:9779')
                 self.haveLliurexMirror = False
-                self.flavours = self.n4d.lliurex_version('','LliurexVersion','-v')[1].split(',')
+                self.flavours = [ x.strip() for x in self.n4d.lliurex_version('','LliurexVersion','-v')[1].split(',') ]
                 if len(self.n4d.get_methods('MirrorManager')) > 0:
                         self.haveLliurexMirror = True
-
                 self.prepareEnvironment()
                 
@@ -55 +54 @@
                 for line in iter(p.stdout.readline,""):
                         stripedline = line.strip()
-                        if stripedline.startswith("Installed")
-                                installed = stripedline.replace("Installed: ")
-                        if stripedline.startswith("Candidate")
-                                candidate = stripedline.replace("Candidate: ")
+                        if stripedline.startswith("Installed"):
+                                installed = stripedline.replace("Installed: ","")
+                        if stripedline.startswith("Candidate"):
+                                candidate = stripedline.replace("Candidate: ","")
                 return {"installed":installed,"candidate":candidate}
 
@@ -143 +142 @@
                                                 targetMetapackage = x[2:]
                                                 break
-                                if targetMetapackage != '':
                 return targetMetapackage
 
@@ -202 +200 @@
                                 packageInfo[package]['candidate'] = raw[0][1:]
                         packageInfo[package].pop('raw')
+                return packageInfo
+
+if __name__ == '__main__':
+        x = LliurexUpCore()

lliurex-up/trunk/fuentes/lliurex-up-gui/LliurexUpCore.py

@@ -15 +15 @@
                 self.n4d = xmlrpclib.ServerProxy('https://localhost:9779')
                 self.haveLliurexMirror = False
-                self.flavours = self.n4d.lliurex_version('','LliurexVersion','-v')[1].split(',')
-
+                self.flavours = [ x.strip() for x in self.n4d.lliurex_version('','LliurexVersion','-v')[1].split(',') ]
                 if len(self.n4d.get_methods('MirrorManager')) > 0:
                         self.haveLliurexMirror = True
-
                 self.prepareEnvironment()
                 
@@ -34 +32 @@
         def writeDefaultSourceslist(self):
                 f = open(os.path.join(self.processSourceslist,'default'),'w')
-                f.write('deb http://lliurex.net/{version} {version} main\n'.format(version=self.defaultVersion))
-                f.write('deb http://lliurex.net/{version} {version}-updates main\n'.format(version=self.defaultVersion))
-                f.write('deb http://lliurex.net/{version} {version}-security main\n'.format(version=self.defaultVersion))
+                f.write('deb http://lliurex.net/{version} {version} main'.format(version=self.defaultVersion))
+                f.write('deb http://lliurex.net/{version} {version}-updates main'.format(version=self.defaultVersion))
+                f.write('deb http://lliurex.net/{version} {version}-security main'.format(version=self.defaultVersion))
                 f.close()
 
-        def getPackageVersionAvailable(self,package,auxoptions=""):
+        def getPackageVersionAvailable(self,package,options=""):
                 '''
                         Args :
@@ -50 +48 @@
                         Options are Apt options 
                 '''
-                command = "LANG=C apt-cache policy {package} {options}".format(package=package,options=auxoptions)
+                command = "LANG=C apt-cache policy {package} {options}".format(package=package,options=options)
                 p = subprocess.Popen(command,shell=True,stdout=subprocess.PIPE)
                 installed = None
@@ -67 +65 @@
                 '''
                 sourceslistDefaultPath = os.path.join(self.processSourceslist,'default')
-                auxoptions = ""
+                options = ""
                 if self.canConnectToLliurexNet():
-                        auxoptions = "-o Dir::Etc::sourcelist={sourceslistOnlyLliurex} -o Dir::Etc::sourceparts=/dev/null".format(sourceslistOnlyLliurex=sourceslistDefaultPath)
-                command = "LANG=C apt-get update {options}".format(options=auxoptions)
+                        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('lliurexup',auxoptions)
+                result = self.getPackageVersionAvailable('lliurex-up',options)
 
                 if result['installed'] != result['candidate']:
@@ -78 +76 @@
                 return True
 
-        def installLliurexUp(self,auxoptions=""):
+        def installLliurexUp(self,options=""):
                 '''
                         Args :
@@ -90 +88 @@
                         This function install lliurex-up
                 '''
-                command = "LANG=C apt-get install testdisk {options}".format(options=auxoptions)
+                #command = "LANG=C apt-get install lliurex-up {options}".format(options=options)
+                command = "LANG=C apt-get install testdisk {options}".format(options=options)
                 p = subprocess.Popen(command,shell=True,stdout=subprocess.PIPE)
                 poutput,perror = p.communicate()
@@ -102 +101 @@
                         result.action : Action to launch
                 '''
-                if self.haveLliurexMirror and ' server' in self.flavours :
-                        print "Chequeando mirror"
-                        self.result = self.n4d.is_update_available('','MirrorManager',self.defaultMirror)
-                        return self.result
+                if self.haveLliurexMirror and 'server' in self.flavours :
+                        result = self.n4d.is_update_available('','MirrorManager',self.defaultMirror)
+                        return result
                 return None
 
@@ -145 +143 @@
                                                 targetMetapackage = x[2:]
                                                 break
-                                if targetMetapackage != '':
-                                        return targetMetapackage
+                return targetMetapackage
 
         def canConnectToLliurexNet(self):
@@ -166 +163 @@
                 '''
                 sourceslistDefaultPath = os.path.join(self.processSourceslist,'default')
-                auxoptions = ""
+                options = ""
                 if self.canConnectToLliurexNet():
-                        auxoptions = "-o Dir::Etc::sourcelist={sourceslistOnlyLliurex} -o Dir::Etc::sourceparts=/dev/null".format(sourceslistOnlyLliurex=sourceslistDefaultPath)
-                command = "LANG=C apt-get update {options}".format(options=auxoptions)
+                        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',auxoptions)
+                return self.getPackageVersionAvailable('lliurex-version-stamp',options)
 
         def getPackagesToUpdate(self):
@@ -205 +202 @@
                         packageInfo[package].pop('raw')
 
-                return packageInfo      
+                return packageInfo
+
+if __name__ == '__main__':
+        x = LliurexUpCore()