Changeset 2594

Timestamp:

Oct 10, 2016, 5:05:12 PM (4 years ago)

Author:

kbut

Message:

increment progress only download debs

Location:

lliurex-mirror/trunk/fuentes

Files:

• lliurex-mirror2/lliurex-mirror.py (modified) (1 diff)
• n4d-lliurex-mirror.install/usr/share/n4d/python-plugins/MirrorManager.py (modified) (2 diffs)

lliurex-mirror/trunk/fuentes/lliurex-mirror2/lliurex-mirror.py

@@ -1438 +1438 @@
                                 
                                 
-                        self.user="lliurex"
+                        self.user="kbut"
                         self.password="lliurex"
                         

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

@@ -165 +165 @@
                 import datetime
                 fd.write("************************* " + str(datetime.datetime.now())+ " ***********************************\n")
+                fd.flush()
                 errors_found = False    
                 self.debmirrorprocess=pexpect.spawn("/usr/bin/debmirror")
+                download_packages = False
+                emergency_counter = 0
                 try:
                         objects["ZCenterVariables"].add_pulsating_color("lliurexmirror")
@@ -173 +176 @@
                 while True:
                         try:
+                                emergency_counter += 1
+                                if emergency_counter > 100:
+                                        download_packages = True
                                 self.debmirrorprocess.expect('\n',timeout=480)
                                 line =self.debmirrorprocess.before
 
+                                fd.write(line + "\n")
+                                fd.flush()
+                                if line.find("Files to download") >= 0 :
+                                        download_packages = True
                                 line1=line.strip("\n")
-                                fd.write(line)
-                                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)
-                                if line1.startswith("Everything OK"):
-                                        self.percentage=(100,self.debmirrorprocess.exitstatus)
-                                        self.variable[distro]['progress'] = 100
-                                        self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable)
+                                if download_packages:
+                                        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)
+                                        if line1.startswith("Everything OK"):
+                                                self.percentage=(100,self.debmirrorprocess.exitstatus)
+                                                self.variable[distro]['progress'] = 100
+                                                self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable)
                                 
                                 if errors_found: