Merge commit 'origin/master'

diff --git a/Makefile b/Makefile
index 8355af5..30d76e2 100644 (file)
--- 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 804d17d..4162684 100644 (file)
--- a/PLC/Methods/UpdatePersonTag.py
+++ b/PLC/Methods/UpdatePersonTag.py
@@ -54,12 +54,14 @@ 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 \
                     min(self.caller['role_ids']) > required_min_role:
-                raise PLCPermissionDenied, "Not allowed to modify the specified person setting, requires role %d",required_min_role
+                raise PLCPermissionDenied, "Not allowed to modify the specified person setting, requires role %d" % required_min_role
 
         person_tag['value'] = value
         person_tag.sync()

diff --git a/PLCAPI.spec b/PLCAPI.spec
index 2eb1116..a5acecf 100644 (file)
--- a/PLCAPI.spec
+++ b/PLCAPI.spec
@@ -1,7 +1,3 @@
-#
-# $Id$
-#
-
 %define url $URL$
 
 %define name PLCAPI
@@ -146,6 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 /var/www/html/wsdl/plcapi.wsdl
 /usr/bin/omf_slicemgr.py*
 /usr/bin/reset_xmpp_pubsub_nodes.py*
+/var/log/plc_api_ratelimit.log
 
 
 %changelog