[Collective-checkins] r247484 - in PASPlugins/collective.salesforce.authplugin/trunk: . collective/salesforce/authplugin/Extensions

[David G. <svn...@pl...>]

Author: davisagli
Date: Tue Dec 20 23:44:39 2011
New Revision: 247484

Modified:
   PASPlugins/collective.salesforce.authplugin/trunk/CHANGES.txt
   PASPlugins/collective.salesforce.authplugin/trunk/collective/salesforce/authplugin/Extensions/install.py
   PASPlugins/collective.salesforce.authplugin/trunk/setup.py
Log:
fix uninstallation bug

Modified: PASPlugins/collective.salesforce.authplugin/trunk/CHANGES.txt
==============================================================================
--- PASPlugins/collective.salesforce.authplugin/trunk/CHANGES.txt	(original)
+++ PASPlugins/collective.salesforce.authplugin/trunk/CHANGES.txt	Tue Dec 20 23:44:39 2011
@@ -1,8 +1,11 @@
 Changelog
 =========
 
-1.6 (unreleased)
+1.5.2 (2011-12-20)
 
+  - Bug fix: don't break during uninstallation if the plugin has already been
+    deleted.
+    [davisagli]
 
 1.5.1 (2011-01-26)
 

Modified: PASPlugins/collective.salesforce.authplugin/trunk/collective/salesforce/authplugin/Extensions/install.py
==============================================================================
--- PASPlugins/collective.salesforce.authplugin/trunk/collective/salesforce/authplugin/Extensions/install.py	(original)
+++ PASPlugins/collective.salesforce.authplugin/trunk/collective/salesforce/authplugin/Extensions/install.py	Tue Dec 20 23:44:39 2011
@@ -98,5 +98,6 @@
         out = StringIO()
                                    
         acl=getToolByName(self, "acl_users")
-        acl.manage_delObjects(ids=[AUTHMULTIPLUGIN,])
-        print >>out, "Removing %s" % AUTHMULTIPLUGIN
+        if AUTHMULTIPLUGIN in acl.objectIds():
+            acl.manage_delObjects(ids=[AUTHMULTIPLUGIN,])
+            print >>out, "Removing %s" % AUTHMULTIPLUGIN

Modified: PASPlugins/collective.salesforce.authplugin/trunk/setup.py
==============================================================================
--- PASPlugins/collective.salesforce.authplugin/trunk/setup.py	(original)
+++ PASPlugins/collective.salesforce.authplugin/trunk/setup.py	Tue Dec 20 23:44:39 2011
@@ -5,7 +5,7 @@
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
-version = '1.6dev'
+version = '1.5.2'
 
 long_description = (
     read('README.txt')