Skip to content

Commit

Permalink
[fc] Repository: Products.CMFPlone
Browse files Browse the repository at this point in the history 
Branch: refs/heads/6.0.x
Date: 2023-10-25T14:04:17+02:00
Author: Johannes Raggam (thet) <[email protected]>
Commit: plone/Products.CMFPlone@98dc366

Fix problem when adding a Plone site with a custom INonInstallable utility without a getNonInstallableProfiles method.

Fixes: #3862.

Files changed:
A news/3862.bugfix
M Products/CMFPlone/browser/admin.py
Repository: Products.CMFPlone

Branch: refs/heads/6.0.x
Date: 2023-10-25T17:04:36+02:00
Author: Maurits van Rees (mauritsvanrees) <[email protected]>
Commit: plone/Products.CMFPlone@98e53c4

Merge pull request #3868 from plone/fix-addsite-no-getnoninstallableprofiles-60

Fix problem when adding a Plone site with a custom INonInstallable ut…

Files changed:
A news/3862.bugfix
M Products/CMFPlone/browser/admin.py
  • Loading branch information
@mauritsvanrees
mauritsvanrees committed Oct 25, 2023
1 parent f1b3669 commit c765334
Showing 1 changed file with 22 additions and 18 deletions.
40 changes: 22 additions & 18 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,36 @@
Repository: plone.app.caching
Repository: Products.CMFPlone


Branch: refs/heads/master
Date: 2023-10-25T08:46:46+02:00
Author: Timo Stollenwerk (tisto) <stollenwerk@kitconcept.com>
Commit: https://github.com/plone/plone.app.caching/commit/48bab816f18d738064434f82546700b9d1417bda
Branch: refs/heads/6.0.x
Date: 2023-10-25T14:04:17+02:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/98dc3661009679dcca01618c3b8d6b618946db5b

Preparing release 3.1.3
Fix problem when adding a Plone site with a custom INonInstallable utility without a getNonInstallableProfiles method.

Fixes: #3862.

Files changed:
M CHANGES.md
M setup.py
D news/122.bugfix
A news/3862.bugfix
M Products/CMFPlone/browser/admin.py

b'diff --git a/Products/CMFPlone/browser/admin.py b/Products/CMFPlone/browser/admin.py\nindex 679c160383..44714defb8 100644\n--- a/Products/CMFPlone/browser/admin.py\n+++ b/Products/CMFPlone/browser/admin.py\n@@ -176,7 +176,11 @@ def profiles(self):\n ]\n utils = getAllUtilitiesRegisteredFor(INonInstallable)\n for util in utils:\n- not_installable.extend(util.getNonInstallableProfiles())\n+ not_installable.extend(\n+ util.getNonInstallableProfiles()\n+ if hasattr(util, "getNonInstallableProfiles")\n+ else []\n+ )\n \n for info in profile_registry.listProfileInfo():\n if info.get("type") == EXTENSION and info.get("for") in (\ndiff --git a/news/3862.bugfix b/news/3862.bugfix\nnew file mode 100644\nindex 0000000000..a9e0e6be6d\n--- /dev/null\n+++ b/news/3862.bugfix\n@@ -0,0 +1,3 @@\n+Fix problem when adding a Plone site with a custom INonInstallable utility without a getNonInstallableProfiles method.\n+\n+Fixes: #3862.\n'

b'diff --git a/CHANGES.md b/CHANGES.md\nindex 340b8b7..bd233c2 100644\n--- a/CHANGES.md\n+++ b/CHANGES.md\n@@ -9,6 +9,14 @@\n \n <!-- towncrier release notes start -->\n \n+## 3.1.3 (2023-10-25)\n+\n+\n+### Bug fixes:\n+\n+- Fix `locked` component of ETag to discriminate between different locks. @JeffersonBledsoe, @davisagli #122\n+\n+\n ## 3.1.2 (2023-06-16)\n \n \ndiff --git a/news/122.bugfix b/news/122.bugfix\ndeleted file mode 100644\nindex 1b2c10f..0000000\n--- a/news/122.bugfix\n+++ /dev/null\n@@ -1 +0,0 @@\n-Fix `locked` component of ETag to discriminate between different locks. @JeffersonBledsoe, @davisagli\ndiff --git a/setup.py b/setup.py\nindex 0045087..47db32f 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -3,7 +3,7 @@\n from setuptools import setup\n \n \n-version = "3.1.3.dev0"\n+version = "3.1.3"\n \n long_description = f"""\n {Path("README.md").read_text()}\\n\n'
Repository: Products.CMFPlone

Repository: plone.app.caching

Branch: refs/heads/6.0.x
Date: 2023-10-25T17:04:36+02:00
Author: Maurits van Rees (mauritsvanrees) <[email protected]>
Commit: https://github.com/plone/Products.CMFPlone/commit/98e53c405b2f2a916594b0db15b17c36a71d6ee8

Branch: refs/heads/master
Date: 2023-10-25T08:47:10+02:00
Author: Timo Stollenwerk (tisto) <[email protected]>
Commit: https://github.com/plone/plone.app.caching/commit/298da573f137d7ae352b044c8a80d3eaffbe5db5
Merge pull request #3868 from plone/fix-addsite-no-getnoninstallableprofiles-60

Back to development: 3.1.4
Fix problem when adding a Plone site with a custom INonInstallable ut…

Files changed:
M setup.py
A news/3862.bugfix
M Products/CMFPlone/browser/admin.py

b'diff --git a/setup.py b/setup.py\nindex 47db32f..193fd91 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -3,7 +3,7 @@\n from setuptools import setup\n \n \n-version = "3.1.3"\n+version = "3.1.4.dev0"\n \n long_description = f"""\n {Path("README.md").read_text()}\\n\n'
b'diff --git a/Products/CMFPlone/browser/admin.py b/Products/CMFPlone/browser/admin.py\nindex 679c160383..44714defb8 100644\n--- a/Products/CMFPlone/browser/admin.py\n+++ b/Products/CMFPlone/browser/admin.py\n@@ -176,7 +176,11 @@ def profiles(self):\n ]\n utils = getAllUtilitiesRegisteredFor(INonInstallable)\n for util in utils:\n- not_installable.extend(util.getNonInstallableProfiles())\n+ not_installable.extend(\n+ util.getNonInstallableProfiles()\n+ if hasattr(util, "getNonInstallableProfiles")\n+ else []\n+ )\n \n for info in profile_registry.listProfileInfo():\n if info.get("type") == EXTENSION and info.get("for") in (\ndiff --git a/news/3862.bugfix b/news/3862.bugfix\nnew file mode 100644\nindex 0000000000..a9e0e6be6d\n--- /dev/null\n+++ b/news/3862.bugfix\n@@ -0,0 +1,3 @@\n+Fix problem when adding a Plone site with a custom INonInstallable utility without a getNonInstallableProfiles method.\n+\n+Fixes: #3862.\n'

0 comments on commit c765334

Please sign in to comment.