Changeset 2137

Timestamp:

Jul 8, 2016, 6:10:50 PM (5 years ago)

Author:

kbut

Message:

wip

Location:

lliurex-mirror/trunk/fuentes

Files:

• lliurex-mirror-cli/etc/bash_completion.d/lliurex-mirror (modified) (1 diff)
• lliurex-mirror-cli/usr/bin/lliurex-mirror (modified) (3 diffs)
• n4d-lliurex-mirror.install/usr/share/n4d/python-plugins/MirrorManager.py (modified) (4 diffs)

lliurex-mirror/trunk/fuentes/lliurex-mirror-cli/etc/bash_completion.d/lliurex-mirror

@@ -10 +10 @@
             #  The basic options we'll complete.
             #
-            opts="setcname rundebmirror isalive getmirrorarchitecture setmirrorarchitecture getmirrororig setmirrororig getchecksumvalidation setchecksumvalidation getpercentage enablewebserverforpath stopwebserver getavailabledistros -H --host -k --key -u --user -p --password"
+            opts="setcname rundebmirror isalive getmirrorarchitecture setmirrorarchitecture getmirrororig setmirrororig getchecksumvalidation setchecksumvalidation getpercentage enablewebserverforpath stopwebserver getavailabledistros -H --host -k --key -u --user -p --password stopupdate"
         
            #

lliurex-mirror/trunk/fuentes/lliurex-mirror-cli/usr/bin/lliurex-mirror

@@ -73 +73 @@
         def stopWebserver(self):
                 result = self.client.stop_webserver(self.credentials,"MirrorManager")
+                print str(result['msg'])
+                sys.exit( 0 if result['status'] else 1 )
+
+        def stopUpdate(self):
+                result = self.client.stopupdate(self.credentials,"MirrorManager")
                 print str(result['msg'])
                 sys.exit( 0 if result['status'] else 1 )
@@ -99 +104 @@
                         puts("enablewebserverforpath PATH")
                         puts("stopwebserver")
+                        puts("stopupdate")
                         puts("getavailabledistros")
                 puts("Flags")
@@ -197 +203 @@
         elif action == "getavailabledistros":
                 lliurexmirror.getAvailableDistros()
-
-
+        elif action == "stopupdate":
+                lliurexmirror.stopUpdate()
+
+

lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install/usr/share/n4d/python-plugins/MirrorManager.py

@@ -59 +59 @@
                                                 self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable)
                                 else:
-                                        self.variable[repo] = self.defaultmirrorinfo
+                                        if not self.variable.has_key(repo):
+                                                self.variable[repo] = self.defaultmirrorinfo
                 except Exception as e:
                         pass
@@ -152 +153 @@
                                 if line1.startswith("[") and line1[5] == "]":
                                         self.percentage=(int(line1[1:4].strip()),self.debmirrorprocess.exitstatus)
+                                        self.variable[distro]['progress'] = self.percentage[0]
+                                        self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable)
                         except pexpect.EOF:
                                         line1 = self.debmirrorprocess.before
@@ -160 +163 @@
                                         status = self.debmirrorprocess.exitstatus
                                         self.percentage=(self.percentage[0],status)
-
+                                        self.variable[distro]['progress'] = self.percentage[0]
                                         self.variable[distro]['status_mirror'] = "Ok" if status == 0 else "Error"
                                         self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable)
@@ -386 +389 @@
                 try:
                         self.debmirrorprocess.terminate()
-                        return {'status':true,'msg':'debmirror stopped'}
+                        return {'status':True,'msg':'debmirror stopped'}
                 except Exception as e:
                         return {'status':False,'msg':str(e)}