Changeset 5114

Timestamp:

Jun 7, 2017, 1:22:11 PM (3 years ago)

Author:

jrpelegrina

Message:

Updated changelog. Fix --sai mode of lliurex-upgrade to enable update server without net connection

Location:

lliurex-up/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• lliurex-up-cli/usr/sbin/lliurex-upgrade (modified) (6 diffs)

lliurex-up/trunk/fuentes/debian/changelog

@@ +1 @@
+lliurex-up (16.04.23) xenial; urgency=medium
+
+  * Fix mode --sai of lliurex-upgrade to enable update server without net connection
+
+ -- Juan Ramon Pelegrina <juapesai@hotmail.com>  Wed, 07 Jun 2017 13:09:33 +0200
+
 lliurex-up (16.04.22) xenial; urgency=medium
 

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

@@ -45 +45 @@
                                 
 
-        def checkInitialFlavour(self,extra_args):
+        def checkInitialFlavour(self,extra_args=None):
 
                 self.allRepos=False
@@ -75 +75 @@
 
                         if "lliurex-meta-server" == self.targetMetapackage or "server" in self.lliurexcore.previousFlavours:
-                                self.cleanEnvironment()
-                                '''
-                                self.lliurexcore.cleanEnvironment()
-                                self.lliurexcore.cleanLliurexUpLock()
-                                '''
-                                return False
-                        else:
-                                return True
+                                if self.initActionsArg !="initActionsSai":
+                                        '''
+                                        self.cleanEnvironment()
+                                        
+                                        self.lliurexcore.cleanEnvironment()
+                                        self.lliurexcore.cleanLliurexUpLock()
+                                        '''
+                                        return False
+                                
+                        print("  [Lliurex-up]: Unable to connect to lliurex.net")
+                        return True
                                 
         #def canConnectToLliurexNet                     
@@ -95 +98 @@
                 else:
                         if is_mirror_running_inserver['ismirrorrunning']:
-                                log_msg="Mirror is being udpated in server. Unable to update the system"
+                                log_msg="Mirror is being updated in server. Unable to update the system"
                                 self.log(log_msg)
                 
@@ -103 +106 @@
         #def clientCheckingMirrorIsRunning              
         
-        def initActionsScript(self,extra_args):
+        def initActionsScript(self,extra_args=None):
 
                 print("  [Lliurex-up]: Checking system")
@@ -555 +558 @@
                 if clientCheckingMirror!=False:
                         if clientCheckingMirror:
-                                print("  [Lliurex-up]: Mirror is being udpated in server. Unable to update the system")
+                                print("  [Lliurex-up]: Mirror is being updated in server. Unable to update the system")
                         else:
                                 print("  [Lliurex-up]: Unable to connect with server")
@@ -655 +658 @@
                 with indent(4):
                         puts("-h --help:                Show help")
-                        puts("-s --sai:         Update the system without pinning")     
+                        puts("-s --sai:         Update the system without pinning and enable try to update without conection to lliurex.net")   
                         puts("-u --unattended:  Update the system in unattended mode. Does not require confirmation to update mirror and system")
                         puts("-n --no-mirror:           Update the system without checking mirror")