Changeset 4370 for lliurex-store/trunk/fuentes/python3-lliurex-store.install

Timestamp:

Apr 20, 2017, 2:50:46 PM (3 years ago)

Author:

Juanma

Message:

Bugfix with removing debs and version mismatching between installed and available

Location:

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

Files:

• plugins/debManager.py (modified) (4 diffs)
• storeManager.py (modified) (2 diffs)

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

@@ -48 +48 @@
                         if appInfo['package'] not in processedPkg:
                                 processedPkg.append(appInfo['package'])
-                                app=self._resolve_App(appInfo['package'])
+                                filters=1
+                                if action=='remove':
+                                        filters=2
+                                app=self._resolve_App(appInfo['package'],filters)
                                 if app:
                                         if action=='install':
@@ -100 +103 @@
                 except Exception as e:
                         self._debug("Remove error: " +str(e.code))
+                        self._debug("Remove error: " +str(e))
                         self._set_status(e.code)
                 finally:
@@ -163 +167 @@
                 applist=[]
                 self.return_msg=False
+                if not filters:
+                        filters=1
                 try:
-                        result=self.installer.resolve(1,[appName,],None,self._fake_callback, None)
+                        self._debug("Filter for resolver: "+str(filters))
+                        result=self.installer.resolve(filters,[appName,],None,self._fake_callback, None)
                         applist=result.get_package_array()
-                        if applist:
-                                self._debug("Application "+applist[0].get_name()+" resolved succesfully")
-                                app=applist[0]
+                        resolvedApp=applist[0]
+                        #resolver bug: filters not work so if we want to remove an app first we must get the installed version...
+                        if filters==2:
+                                for app in applist:
+                                        if (str(app.get_info()).find('PK_INFO_ENUM_INSTALLED')!=-1):
+                                                resolvedApp=app
+                        if resolvedApp:
+                                self._debug("Application "+resolvedApp.get_name()+" resolved succesfully")
+                                app=resolvedApp
                 except Exception as e:
                         self._debug("Couldn't resolve "+appName)
@@ -176 +189 @@
                 return(app)
         #def _resolve_App
+        

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

@@ -485 +485 @@
                         #Check if package is installed if we want to remove it or vice versa
                         for appInfo in applistInfo:
-                                if (action=='install' and appInfo['state']=='installed') or (action=='remove' and appInfo['state']=='available'):
+#                               if (action=='install' and appInfo['state']=='installed') or (action=='remove' and appInfo['state']=='available'):
+                                if (action=='remove' and appInfo['state']=='available'):
                                         if action=='remove':
 #                                               self.result[action]['status']={appInfo['package']:3}
@@ -491 +492 @@
                                         else:
 #                                               self.result[action]['status']={appInfo['package']:4}
-                                                self.result[action]['status']={'status':4}
+#                                               self.result[action]['status']={'status':4}
+                                                pass
                                         return_msg=False
                                         typeDict={}