diff --git a/lib/cmdlib.py b/lib/cmdlib.py index 8d0b9baf329e5a2d74be96e69d356eb1ba1666d2..daaee2264c8614f35d879fc888d10b470d4ca908 100644 --- a/lib/cmdlib.py +++ b/lib/cmdlib.py @@ -9927,12 +9927,13 @@ class LUDelTags(TagsLU): objects.TaggableObject.ValidateTag(tag) del_tags = frozenset(self.op.tags) cur_tags = self.target.GetTags() - if not del_tags <= cur_tags: - diff_tags = del_tags - cur_tags - diff_names = ["'%s'" % tag for tag in diff_tags] - diff_names.sort() + + diff_tags = del_tags - cur_tags + if diff_tags: + diff_names = ("'%s'" % i for i in sorted(diff_tags)) raise errors.OpPrereqError("Tag(s) %s not found" % - (",".join(diff_names)), errors.ECODE_NOENT) + (utils.CommaJoin(diff_names), ), + errors.ECODE_NOENT) def Exec(self, feedback_fn): """Remove the tag from the object.