Changeset 2556

Timestamp:

Oct 5, 2016, 10:08:15 AM (3 years ago)

Author:

hectorgh

Message:

supporting more debmirror states

File:

• lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install/usr/share/n4d/python-plugins/MirrorManager.py (modified) (8 diffs)

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

@@ -154 +154 @@
                 # link config debmirror to correct path with distro name
                 self.variable[distro]['status_mirror'] = "Working"
+                self.variable[distro]['progress'] = 0
+                self.variable[distro]['exception_msg'] = ""
                 self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable)
                 self.build_debmirror_config(distro)
@@ -160 +162 @@
                 os.symlink(os.path.join(self.debmirrorconfpath,distro),'/etc/debmirror.conf')
                 self.mirrorworking = distro
+
+                errors_found = False    
                 self.debmirrorprocess=pexpect.spawn("/usr/bin/debmirror")
                 try:
@@ -167 +171 @@
                 while True:
                         try:
-                                self.debmirrorprocess.expect('\n')
+                                self.debmirrorprocess.expect('\n',timeout=480)
                                 line =self.debmirrorprocess.before
                                 line1=line.strip("\n")
@@ -174 +178 @@
                                         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:
+                                        e=Exception(line1)
+                                        raise e
+                                if line1.startswith("Errors"):
+                                        errors_found = True
+        
+
                         except pexpect.EOF:
                                         line1 = self.debmirrorprocess.before
@@ -186 +202 @@
                                         break
                         except Exception as e:
+                                print e
                                 self.variable[distro]['status_mirror'] = "Error"
+                                self.variable[distro]["exception_msg"] = str(e)
+                                status = self.debmirrorprocess.exitstatus
+                                self.percentage=(self.percentage[0],str(e))
                                 self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable)
                                 break
@@ -231 +251 @@
                 self.variable[distro]["progress"]=self.percentage[0]
                 
-                print self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable)
+                self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable)
                 
                 #set_custom_text(self,app,text):
@@ -346 +366 @@
                         
                 return {'status':False,'msg':"debmirror.conf hasn't option update variable" }
-        #def set_option_update
+        #def get_option_update
 
         def set_option_update(self,distro,option):
@@ -483 +503 @@
                 dest=os.path.join(path,f)
 
-                orig_mirror=self.get_mirror_orig(distro)
+                orig_mirror=self.get_mirror_orig(distro,"1")
                 url_mirror="http://"+os.path.join(orig_mirror['msg'],f)