Changeset 3648

Timestamp:

Feb 16, 2017, 12:39:30 PM (3 years ago)

Author:

jrpelegrina

Message:

Fix code

Location:

lliurex-up/trunk/fuentes

Files:

• lliurex-up-cli/usr/sbin/lliurex-upgrade (modified) (5 diffs)
• lliurex-up/usr/share/lliurex-up/lliurex-up.py (modified) (1 diff)

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

@@ -9 +9 @@
 import datetime
 import time
+import signal
+
 
 class LliurexUpCli(object):
@@ -17 +19 @@
                 self.log(log_msg)
                 self.checkInitialFlavour()
+
         
         def checkInitialFlavour(self):
@@ -90 +93 @@
                 if is_mirror_updated !=None:
                         is_mirror_running=self.lliurexcore.lliurexMirrorIsRunning()
-
-                        if is_mirror_updated['action']=='update':
-                                log_msg="Checking mirror. Is mirror update: False"
-                                self.log(log_msg)
-                                if not is_mirror_running:
-                                        response=raw_input('  [LLiurex-up]: Do you want update mirror (yes/no): ').lower()
-                                        if response.startswith('y'):
-                                                log_msg="Update lliurex-mirror: Yes"
-                                                self.log(log_msg)
-                                                print("  [Lliurex-up]: Updating mirror. Wait a moment please")
-                                                command='lliurex-mirror update llx16'
-                                                os.system(command)
-                                        else:
-                                                log_msg="Update lliurex-mirror: No"
-                                                self.log(log_msg)
-                                                print("  [Lliurex-up]: Mirror update.Nothing to do")            
+                        if is_mirror_running:
+                                print("  [Lliurex-up]: Updating mirror. Wait a moment please")
+                                command='lliurex-mirror update llx16'
+                                os.system(command)
+
+                        else:
+                                if is_mirror_updated['action']=='update':
+                                        log_msg="Checking mirror. Is mirror update: False"
+                                        self.log(log_msg)
+                                        if not is_mirror_running:
+                                                response=raw_input('  [LLiurex-up]: Do you want update mirror (yes/no): ').lower()
+                                                if response.startswith('y'):
+                                                        log_msg="Update lliurex-mirror: Yes"
+                                                        self.log(log_msg)
+                                                        print("  [Lliurex-up]: Updating mirror. Wait a moment please")
+                                                        command='lliurex-mirror update llx16'
+                                                        os.system(command)
+                                                else:
+                                                        log_msg="Update lliurex-mirror: No"
+                                                        self.log(log_msg)
+                                                        print("  [Lliurex-up]: Mirror update.Nothing to do")            
                 else:
                         log_msg="Checking mirror. Is mirror update: None"
@@ -275 +283 @@
                 f=open(log_file,"a+")
                 f.write(msg + '\n')
-                f.close()               
-
+                f.close()       
+
+        
         def main(self,mode):
 
@@ -306 +315 @@
                                 print("  [Lliurex-up]: Number of packages to update: " +  str(len(self.packages)) + " (" + str(self.newpackages) + " news)" )
 
-                                response=raw_input('  [LLiurex-up]: Do you want to udpate the system(yes/no)): ').lower()
+                                response=raw_input('  [LLiurex-up]: Do you want to update the system (yes/no)): ').lower()
                                 if response.startswith('y'):
                                         self.preActionsScript()

lliurex-up/trunk/fuentes/lliurex-up/usr/share/lliurex-up/lliurex-up.py

@@ -250 +250 @@
                 self.vterminal.set_font(font_terminal)
                 self.vterminal.set_scrollback_lines(-1)
+                self.vterminal.set_sensitive(False)
                 self.terminal_scrolled.add(self.vterminal)