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

Timestamp:

Dec 9, 2016, 3:02:23 PM (4 years ago)

Author:

kbut

Message:

prepare scripts to lliurex-up

File:

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

lliurex-up/trunk/fuentes/LliurexUpCore.py

@@ -13 +13 @@
                 self.defaultVersion = 'xenial'
                 self.processPath = '/var/run/lliurex-up'
-                self.changelogsPath = '/var/run/lliurex-up/changelogs'
-                self.processSourceslist = '/var/run/lliurex-up/sourceslist'
+                self.changelogsPath = os.path.join(self.processPath,'changelogs')
+                self.processSourceslist = os.path.join(self.processPath,'sourceslist')
                 self.previousflavourspath = os.path.join(self.processPath,'previousflavours')
 
@@ -23 +23 @@
                 self.haveLliurexMirror = False
                 self.previuosFlavours = []
+                self.flavours = []
                 self.getPreviuosFlavours()
                 if len(self.n4d.get_methods('MirrorManager')) > 0:
@@ -34 +35 @@
                         lines = aux.readlines()
                         for x in lines:
-                                self.previousflavourspath.push(x)
+                                self.previuosFlavours.append(x.strip())
                         aux.close()
 
@@ -48 +49 @@
         def writeDefaultSourceslist(self):
                 f = open(os.path.join(self.processSourceslist,'default'),'w')
-                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.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.close()
 
@@ -57 +58 @@
                         This funcion delete all environment and rebuild environment
                 '''
+                if not os.path.exists(self.processPath):
+                        os.mkdir(self.processPath)
+                if not os.path.exists(processSourceslist):
+                        os.mkdir(self.processSourceslist)
+                if not os.path.exists(self.changelogsPath):
+                        os.mkdir(self.changelogsPath)
+                self.writeDefaultSourceslist()
+
+        def cleanEnvironment(self):
                 if os.path.exists(self.processPath):
                         shutil.rmtree(os.path.join(self.processPath))
-                os.mkdir(self.processPath)
-                os.mkdir(self.processSourceslist)
-                os.mkdir(self.changelogsPath)
-                self.writeDefaultSourceslist()
 
 
@@ -200 +206 @@
                         options = "-o Dir::Etc::sourcelist={sourceslistOnlyLliurex} -o Dir::Etc::sourceparts=/dev/null".format(sourceslistOnlyLliurex=sourceslistDefaultPath)
                 self.updateCacheApt(options)
-                return self.getPackageVersionAvailable('lliurex-version-stamp',options)
+                return self.getPackageVersionAvailable('lliurex-version-timestamp',options)
 
         def getLliurexVersionLocal(self):
                 self.updateCacheApt('')
-                return self.getPackageVersionAvailable('lliurex-version-stamp','')              
+                return self.getPackageVersionAvailable('lliurex-version-timestamp','')          
 
         def preActionsScript(self):