Changeset b312431b

Timestamp:

Dec 3, 2008 2:23:37 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

266e866

Parents:

375ca67

Message:

A few small bugs

File:

• fedd/federation/allocate_project.py (modified) (4 diffs)

fedd/federation/allocate_project.py

@@ -48 +48 @@
         """
 
-        self.debug = config.get("allocate", "debug", False)
+        self.debug = config.getboolean("allocate", "debug", False)
         self.wap = config.get('allocate', 'wap', '/usr/testbed/sbin/wap')
         self.newproj = config.get('allocate', 'newproj',
@@ -61 +61 @@
                 '/usr/testbed/sbin/newuser')
         self.addpubkey = config.get('allocate', 'addpubkey', 
-                '/usr/testbed/sbin/taddpubkey')
+                '/usr/testbed/sbin/addpubkey')
         self.grantnodetype = config.get('allocate', 'grantnodetype', 
                 '/usr/testbed/sbin/grantnodetype')
@@ -357 +357 @@
                     if k.has_key('sshPubkey')]:
                 if self.allocation_level >= self.dynamic_keys:
-                    cmds.append((self.wap, self.addpubkey, '-w', \
+                    cmds.append((self.wap, self.addpubkey, '-r', \
                             '-u', name, '-k', sk))
                 elif self.allocation_level >= self.confirm_keys:
@@ -438 +438 @@
                     if (name.rstrip(), sk.rstrip()) not in self.fixed_keys:
                         if self.allocation_level >= self.dynamic_keys:
-                            cmds.append((self.wap, self.addpubkey, '-R', '-w', \
+                            cmds.append((self.wap, self.addpubkey, '-R', '-r', \
                                     '-u', name, '-k', sk))