@@ -85,7 +85,10 @@ def include(self, include):
85
85
def remove (self ):
86
86
"""Remove resource or resource group from parent group."""
87
87
if not self .parent :
88
- raise ResourceError ('Object is no member of a resource group' )
88
+ raise ResourceError (
89
+ 'Cannot remove resource or resource group "{}".'
90
+ ' It is no member of a resource group' .format (self .name )
91
+ )
89
92
self .parent .members .remove (self )
90
93
self .parent = None
91
94
@@ -136,7 +139,10 @@ def __init__(
136
139
:raise ResourceError: No resource and no url given.
137
140
"""
138
141
if resource is None and url is None :
139
- raise ResourceError ('Either resource or url must be given' )
142
+ raise ResourceError (
143
+ 'Either resource or url must be given for resource '
144
+ '"{}"' .format (name )
145
+ )
140
146
super (Resource , self ).__init__ (
141
147
name = name , directory = directory , path = path ,
142
148
include = include , group = group
@@ -169,7 +175,9 @@ def file_path(self):
169
175
"""Absolute resource file path depending on operation mode."""
170
176
directory = self .directory
171
177
if not directory :
172
- raise ResourceError ('No directory set on resource.' )
178
+ raise ResourceError (
179
+ 'No directory set on resource "{}".' .format (self .name )
180
+ )
173
181
return os .path .join (directory , self .file_name )
174
182
175
183
@property
@@ -323,8 +331,10 @@ def integrity(self):
323
331
def integrity (self , integrity ):
324
332
if integrity is True :
325
333
if self .url is not None :
326
- msg = 'Cannot calculate integrity hash from external resource'
327
- raise ResourceError (msg )
334
+ raise ResourceError (
335
+ 'Cannot calculate integrity hash from external resource '
336
+ '"{}"' .format (self .name )
337
+ )
328
338
self ._integrity_hash = None
329
339
else :
330
340
self ._integrity_hash = integrity
@@ -564,8 +574,10 @@ def add(self, member):
564
574
"""
565
575
if not isinstance (member , (ResourceGroup , Resource )):
566
576
raise ResourceError (
567
- 'Resource group can only contain instances '
568
- 'of ``ResourceGroup`` or ``Resource``'
577
+ 'Resource group "{}" can only contain instances '
578
+ 'of ``ResourceGroup`` or ``Resource`` (member: "{}")' .format (
579
+ self .name , member .name
580
+ )
569
581
)
570
582
member .parent = self
571
583
self ._members .append (member )
0 commit comments