container: fix jujud arguments.

state/unit.go

 package state
 
 import (
         "errors"
         "fmt"
         "launchpad.net/goyaml"
         "launchpad.net/gozk/zookeeper"
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/state/presence"
         "launchpad.net/juju-core/trivial"
@@ skipping 463 matching lines @@
 // See OpenPorts for details.
 func (u *Unit) WatchPorts() *PortsWatcher {
         return newPortsWatcher(u.st, u.zkPortsPath())
 }
 
 // AgentAlive returns whether the respective remote agent is alive.
 func (u *Unit) AgentAlive() (bool, error) {
         return presence.Alive(u.st.zk, u.zkAgentPath())
 }
 
-// AgentName returns the name used to identify the unit's agent.
-func (u *Unit) AgentName() string {
-        return fmt.Sprintf("unit-%s-%d", u.serviceName, keySeq(u.key))
+// PathKey returns a name identifying the unit that can be used as a
+// file name.  The returned key will be different from other
+// PathKeys returned by any other entities from the same state.
+func (u *Unit) PathKey() string {
+        return "unit-" + strings.Replace(u.Name(), "/", "-", -1)
 }
 
 // WaitAgentAlive blocks until the respective agent is alive.
 func (u *Unit) WaitAgentAlive(timeout time.Duration) error {
         err := presence.WaitAlive(u.st.zk, u.zkAgentPath(), timeout)
         if err != nil {
                 return fmt.Errorf("waiting for agent of unit %q: %v", u, err)
         }
         return nil
 }
@@ skipping 64 matching lines @@
 // valid mode if acceptNone is true.
 func validResolvedMode(mode ResolvedMode, acceptNone bool) error {
         if acceptNone && mode == ResolvedNone {
                 return nil
         }
         if mode != ResolvedRetryHooks && mode != ResolvedNoHooks {
                 return fmt.Errorf("invalid error resolution mode: %d", mode)
         }
         return nil
 }