Changeset 4563

Timestamp:

May 4, 2017, 11:10:35 AM (4 years ago)

Author:

jrpelegrina

Message:

Change method to get lliurex-version

Location:

lliurex-up/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• lliurex-up-cli/usr/sbin/lliurex-upgrade (modified) (1 diff)
• python-lliurex-up/lliurex/lliurexup/__init__.py (modified) (2 diffs)

lliurex-up/trunk/fuentes/debian/changelog

@@ +1 @@
+lliurex-up (16.04.18) xenial; urgency=medium
+
+  * Change method to get lliurex-version
+
+ -- Juan Ramon Pelegrina <juapesai@hotmail.com>  Thu, 04 May 2017 10:52:40 +0200
+
 lliurex-up (16.04.17) xenial; urgency=medium
 

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

@@ -413 +413 @@
 
                         log_msg="Final check metapackage. Metapackage to install:%s"%self.flavourToInstall
+                        self.log(log_msg)
                                                         
                         if self.flavourToInstall!=None:

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

@@ -141 +141 @@
         def updateFlavoursList(self):
                 
-                self.flavours = [ x.strip() for x in self.n4d.lliurex_version('','LliurexVersion','-v')[1].split(',') ]
+                #self.flavours = [ x.strip() for x in self.n4d.lliurex_version('','LliurexVersion','-v')[1].split(',') ]
+                cmd='lliurex-version -v'
+                p=subprocess.Popen(cmd,shell=True,stdout=subprocess.PIPE)
+                result=p.communicate()
+                self.flavours = [ x.strip() for x in result[0].split(',') ]
+
                 if len(self.flavours) > 0:
                         aux = open(self.previousflavourspath,'w')
@@ -370 +375 @@
                 if 'None' in self.flavours:
                         # get last flavour
-                        result = self.n4d.lliurex_version('','LliurexVersion','--history')
+                        #result = self.n4d.lliurex_version('','LliurexVersion','--history')
+                        cmd='lliurex-version --history'
+                        p=subprocess.Popen(cmd,shell=True, stdout=subprocess.PIPE)
+                        result=p.communicate()
                         if result[0]:
-                                history = [ x.strip().split('\t')[0].strip() for x in result[1].split('\n') ]
+                                #history = [ x.strip().split('\t')[0].strip() for x in result[1].split('\n') ]
+                                history = [ x.strip().split('\t')[0].strip() for x in result[0].split('\n') ]
                                 history = [ x for x in history if not 'lliurex-meta-live' in x ]
                                 for x in reversed(history):