From 03cc4970d0e6b3be5de54a2d226dcbd787e50646 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 31 Aug 2010 17:31:48 +0000
Subject: [PATCH] Fixed the behaviour of some build commands to match that in
 wiki build tutorial.

---
 game/gamesrc/commands/default/privileged.py | 19 +++++++++++++------
 src/typeclasses/models.py                   |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/game/gamesrc/commands/default/privileged.py b/game/gamesrc/commands/default/privileged.py
index 51347261b8..391ab62551 100644
--- a/game/gamesrc/commands/default/privileged.py
+++ b/game/gamesrc/commands/default/privileged.py
@@ -587,6 +587,7 @@ class CmdPerm(MuxCommand):
     or those defined on the <object>/<player> argument. 
     """
     key = "@perm"
+    aliases = "@setperm"
     permissions = "cmd:perm"
     help_category = "Admin"
 
@@ -600,7 +601,9 @@ class CmdPerm(MuxCommand):
         if not self.args:
             
             if "list" not in switches:
-                caller.msg("Usage: @setperm[/switch] [player = permission]")
+                string = "Usage: @setperm[/switch] [object = permission]\n" 
+                string +="       @setperm[/switch] [*player = permission]"
+                caller.msg(string)
                 return
             else:
                 #just print all available permissions
@@ -646,10 +649,14 @@ class CmdPerm(MuxCommand):
 
         else:
             # As an extra check, we warn the user if they customize the 
-            # permission string (which is okay, and is used by the lock system)
+            # permission string (which is okay, and is used by the lock system)            
             permissions = obj.permissions
-            permissions.append(rhs)
-            obj.permissions = permissions
-            string = "Permission '%s' given to %s." % (rhs, obj.name)
+            if rhs in permissions:
+                string = "Permission '%s' is already defined on %s." % (rhs, obj.name)
+            else:
+                permissions.append(rhs)
+                obj.permissions = permissions
+                string = "Permission '%s' given to %s." % (rhs, obj.name)
+                obj.msg("%s granted you the permission '%s'." % (caller.name, rhs))
             caller.msg(string)  
-            obj.msg("%s granted you the permission '%s'." % (caller.name, rhs))
+            
diff --git a/src/typeclasses/models.py b/src/typeclasses/models.py
index fc770c6898..f6500ad9f7 100644
--- a/src/typeclasses/models.py
+++ b/src/typeclasses/models.py
@@ -460,7 +460,7 @@ class TypedObject(SharedMemoryModel):
     def permissions_set(self, value):
         "Setter. Allows for self.name = value. Stores as a comma-separated string."
         if is_iter(value):
-            value = ",".join([str(val).strip().lower() for val in value])
+            value = ",".join([str(val).strip() for val in value])
         self.db_permissions = value
         self.save()        
     #@permissions.deleter