Changeset 6655

Timestamp:

Jan 23, 2018, 12:36:00 PM (3 years ago)

Author:

jrpelegrina

Message:

Fix code

Location:

epi/trunk/fuentes

Files:

• epi-cli/__init__.py (modified) (2 diffs)
• python3-epi/epimanager.py (modified) (2 diffs)

epi/trunk/fuentes/epi-cli/__init__.py

@@ -197 +197 @@
                         error=self.readErrorOutput(output[1])
                         if error:
-                                msg_log
-                                print('  [EPIC]: Installation aborted. Error preparing system:' +'\n'+str(output[1]))
+                                msg_log='Installation aborted. Error preparing system:' '\n' + str(output[1])
+                                print('  [EPIC]: ' +msg_log)
                                 self.write_log(msg_log)
                                 return False
@@ -334 +334 @@
                                                 error=True
 
-                                if error:
-                                        self.epicore.zerocenter_feedback(order,'install',result)
-                                        self.epicore.remove_repo_keys()
-                                        return 1
+                                        if error:
+                                                self.epicore.zerocenter_feedback(order,'install',result)
+                                                self.epicore.remove_repo_keys()
+                                                return 1
 
                                 msg_log='Installation completed successfully'

epi/trunk/fuentes/python3-epi/epimanager.py

@@ -278 +278 @@
                 else:
                         for item in self.epi_conf["pkg_list"]:
+                                update_repo=False
                                 app=item["name"]
                                 command="LANG=C LANGUAGE=en apt-cache policy %s"%app
@@ -283 +284 @@
                                 output=p.communicate()
                                 if str(output[0]) != '':
-                                        if str(output[0]).split("\\n")[2].split(":")[1]=="":
-                                                cmd="LANG=C LANGUAGE=en apt-get update; "
-                                                return cmd
-
-                                else:
+                                        tmp=str(output[0]).split("\\n")
+                                        if len(tmp)>1:
+                                                if tmp[2].split(":")[1]=="":
+                                                        update_repo=True
+                                                        #cmd="LANG=C LANGUAGE=en apt-get update; "
+                                                        #return cmd
+                                        else:
+                                                update_repo=True
+                                                #cmd="LANG=C LANGUAGE=en apt-get update; "
+                                                #return cmd             
+
+                                else:
+                                        update_repo=True
+
+                                if update_repo: 
                                         cmd="LANG=C LANGUAGE=en apt-get update; "
                                         return cmd