trivial renames in uniter/charm

worker/uniter/charm/git.go

Index: worker/uniter/charm/git.go
=== modified file 'worker/uniter/charm/git.go'
--- worker/uniter/charm/git.go	2012-09-07 07:30:26 +0000
+++ worker/uniter/charm/git.go	2012-09-11 15:34:31 +0000
@@ -161,21 +161,6 @@
 	return strings.Split(trim, "\n"), nil
 }
 
-// ReadCharmURL reads the charm identity file from the directory.
-func (d *GitDir) ReadCharmURL() (*charm.URL, error) {
-	path := filepath.Join(d.path, ".juju-charm")
-	surl := ""
-	if err := trivial.ReadYaml(path, &surl); err != nil {
-		return nil, err
-	}
-	return charm.ParseURL(surl)
-}
-
-// WriteCharmURL writes a charm identity file into the directory.
-func (d *GitDir) WriteCharmURL(url *charm.URL) error {
-	return trivial.WriteYaml(filepath.Join(d.path, ".juju-charm"), url.String())
-}
-
 // cmd runs the specified command inside the directory. Errors will be logged
 // in detail.
 func (d *GitDir) cmd(args ...string) error {
@@ -205,3 +190,18 @@
 	}
 	return statuses, nil
 }
+
+// ReadCharmURL reads the charm identity file from the supplied GitDir.
+func ReadCharmURL(d *GitDir) (*charm.URL, error) {
+	path := filepath.Join(d.path, ".juju-charm")
+	surl := ""
+	if err := trivial.ReadYaml(path, &surl); err != nil {
+		return nil, err
+	}
+	return charm.ParseURL(surl)
+}
+
+// WriteCharmURL writes a charm identity file into the directory.
+func WriteCharmURL(d *GitDir, url *charm.URL) error {
+	return trivial.WriteYaml(filepath.Join(d.path, ".juju-charm"), url.String())
+}