summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/ansible/galaxy/collection.py5
-rw-r--r--lib/ansible/utils/collection_loader.py2
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/ansible/galaxy/collection.py b/lib/ansible/galaxy/collection.py
index b3e150fb0a..0569605a3d 100644
--- a/lib/ansible/galaxy/collection.py
+++ b/lib/ansible/galaxy/collection.py
@@ -454,7 +454,10 @@ def validate_collection_name(name):
if AnsibleCollectionRef.is_valid_collection_name(collection):
return name
- raise AnsibleError("Invalid collection name '%s', name must be in the format <namespace>.<collection>." % name)
+ raise AnsibleError("Invalid collection name '%s', "
+ "name must be in the format <namespace>.<collection>. "
+ "Please make sure namespace and collection name contains "
+ "characters from [a-zA-Z0-9_] only." % name)
@contextmanager
diff --git a/lib/ansible/utils/collection_loader.py b/lib/ansible/utils/collection_loader.py
index 81e3f4fac0..ec496524b5 100644
--- a/lib/ansible/utils/collection_loader.py
+++ b/lib/ansible/utils/collection_loader.py
@@ -474,7 +474,7 @@ class AnsibleCollectionRef:
@staticmethod
def is_valid_collection_name(collection_name):
"""
- Validates if is string is a well-formed collection name (does not look up the collection itself)
+ Validates if the given string is a well-formed collection name (does not look up the collection itself)
:param collection_name: candidate collection name to validate (a valid name is of the form 'ns.collname')
:return: True if the collection name passed is well-formed, False otherwise
"""