Changeset 3661

Timestamp:

Feb 17, 2017, 2:22:57 PM (3 years ago)

Author:

Juanma

Message:

WIP on blacklist

Location:

lliurex-store/trunk/fuentes

Files:

• lliurex-store-cli/usr/share/lliurex-store/files (added)
• lliurex-store-cli/usr/share/lliurex-store/files/blacklist.json (added)
• lliurex-store-cli/usr/share/lliurex-store/files/error.json (added)
• lliurex-store-cli/usr/share/lliurex-store/lliurex-store-cli.py (modified) (2 diffs)
• python3-lliurex-store.install/usr/share/lliurexstore/plugins/loadStore.py (modified) (3 diffs)
• python3-lliurex-store.install/usr/share/lliurexstore/storeManager.py (modified) (2 diffs)

lliurex-store/trunk/fuentes/lliurex-store-cli/usr/share/lliurex-store/lliurex-store-cli.py

@@ -46 +46 @@
                                                                                 pkgName=dependency.split(';')[0]
                                                                                 pkgString.append(pkgName)
-                                                                print(u'Depends: '+' '+','.join(pkgString))
+                                                                print(u'Depends: '+' '+', '.join(pkgString))
                                                                 print("")
                                                         except Exception as e:
@@ -74 +74 @@
                                                         print(data)
                                 else:
-                                        print (u"Error: "+str(status['status']))
+                                        msg=u"Package"
+                                        failed=parms[action]
+                                        if (action=='install' or action=='remove'):
+                                                        msg=u"Unable to"+' '+action
+                                        if action=='list':
+                                                        msg=u"Section"
+                                                        failed=', '.join(failed)
+
+                                        print (color.RED+u"Error"+": "+color.END+msg+' '+failed+' '+status['msg'])
                                 printed=True
                 return(printed)

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins/loadStore.py

@@ -4 +4 @@
 gi.require_version('AppStreamGlib', '1.0')
 from gi.repository import AppStreamGlib as appstream
+import subprocess
 
 class loadstore:
@@ -36 +37 @@
         #def execute_action
 
-        def get_error(self)
+        def get_error(self):
                 return (self.error)
 
@@ -77 +78 @@
                         if not app.get_pkgnames():
                                 store.remove_app(app)
+                #Check the blacklist
+                flavour=subprocess.check_output(["lliurex-version","-f"]).rstrip()
+
                 return (store)
         #def _sanitize_store
+

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/storeManager.py

@@ -6 +6 @@
 import pkgutil
 import lliurexstore.plugins as plugins
+import json
 ######
 #Ver. 1.0 of storeManager.py
@@ -310 +311 @@
         def get_status(self,action=None):
                 self.lock.acquire()
+
                 result={}
                 if action in self.result:
                         result=self.result[action]['status']
+                        errorFile=open('/usr/share/lliurex-store/files/error.json').read()
+                        errorCodes=json.loads(errorFile)
+                        result['msg']=errorCodes[str(result['status'])]
                 self.lock.release()
                 return(result)