openstack
/
murano
Code Issues Proposed changes

Merge "Improve message for publish package conflict"

This commit is contained in:
Jenkins 2015-12-02 11:02:11 +00:00 committed by Gerrit Code Review
parent ce6a29d6a2 06f6d46008
commit 8bbc876278
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
murano/db/catalog/api.py
View File

@ -238,12 +238,13 @@ def package_update(pkg_id_or_name, changes, context):
class_names = [clazz.name for clazz in pkg.class_definitions]
if was_private and became_public:
with db_session.get_lock("public_packages", session):
_check_for_existing_classes(session, class_names, None,
check_public=True,
ignore_package_with_id=pkg.id)
_check_for_public_packages_with_fqn(session,
pkg.fully_qualified_name,
pkg.id)
_check_for_existing_classes(session, class_names, None,
check_public=True,
ignore_package_with_id=pkg.id)
session.add(pkg)
return pkg