From: root <root@blitz.inria.fr>
Date: Mon, 15 Nov 2010 22:50:02 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Tag: plcapi-5.0-19~58
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9e29bc931570666bfc194df1aa631166f72f29d7;hp=a225821931d0a387a83e93f68a304da47a182085;p=plcapi.git

Merge commit 'origin/master'
---

diff --git a/Makefile b/Makefile
index 8355af5b..30d76e23 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,6 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #
-# $Id$
-# $URL$
-#
 
 # python-pycurl and python-psycopg2 avail. from fedora 5
 # we used to ship our own version of psycopg2 and pycurl, for fedora4
diff --git a/PLC/Methods/UpdatePersonTag.py b/PLC/Methods/UpdatePersonTag.py
index 804d17de..780b06d0 100644
--- a/PLC/Methods/UpdatePersonTag.py
+++ b/PLC/Methods/UpdatePersonTag.py
@@ -54,7 +54,9 @@ class UpdatePersonTag(Method):
         if 'admin' not in self.caller['roles']:
             # check caller is affiliated with this person's person
             if not self.caller.can_update(person):
-                raise PLCPermissionDenied, "Not a member of the person's persons: %s"%person['person_ids']
+                raise PLCPermissionDenied, "person_id %s doesn't have access to person_tag_id %s" % (
+                    person['person_id'],
+                    person_tag['person_tag_id'])
 
             required_min_role = person_tag['min_role_id']
             if required_min_role is not None and \
diff --git a/PLCAPI.spec b/PLCAPI.spec
index 98236bbe..1e989263 100644
--- a/PLCAPI.spec
+++ b/PLCAPI.spec
@@ -1,7 +1,3 @@
-#
-# $Id$
-#
-
 %define url $URL$
 
 %define name PLCAPI