Merge lp:~thumper/juju-core/fix-prepare-chown into lp:~go-bot/juju-core/trunk

[Tim Penhey]

Remove chown from environ.configstore

The chown code was there primarily for the local provider.
This is no longer needed (and had a slight bug where it wasn't
actually checking to see if the current user was root before
trying to chown the files and dirs).

The code has simply been removed. I have tested this with
another user I have on my laptop and the local provider bootstraps
fine.

https://codereview.appspot.com/51150044/

Remove chown from environ.configstore

The chown code was there primarily for the local provider.
This is no longer needed (and had a slight bug where it wasn't
actually checking to see if the current user was root before
trying to chown the files and dirs).

The code has simply been removed. I have tested this with
another user I have on my laptop and the local provider bootstraps
fine.

https://codereview.appspot.com/51150044/

[Tim Penhey (thumper)]

Reviewers: mp+203254_code.launchpad.net,

Message:
Please take a look.

Description:
Remove chown from environ.configstore

The chown code was there primarily for the local provider.
This is no longer needed (and had a slight bug where it wasn't
actually checking to see if the current user was root before
trying to chown the files and dirs).

The code has simply been removed. I have tested this with
another user I have on my laptop and the local provider bootstraps
fine.

https://code.launchpad.net/~thumper/juju-core/fix-prepare-chown/+merge/203254

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/51150044/

Affected files (+2, -23 lines):
   A [revision details]
   M environs/configstore/disk.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140125125332-eckpnh62bygibitl
+New revision: <email address hidden>

Index: environs/configstore/disk.go
=== modified file 'environs/configstore/disk.go'
--- environs/configstore/disk.go 2014-01-22 22:48:54 +0000
+++ environs/configstore/disk.go 2014-01-26 19:19:03 +0000
@@ -58,20 +58,6 @@
   return filepath.Join(d.dir, "environments", envName+".jenv")
  }

-func ensurePathOwnedByUser(path string) error {
- uid, gid, err := utils.SudoCallerIds()
- if err != nil {
- return err
- }
- if uid != 0 {
- logger.Debugf("Making %v owned by %d:%d", path, uid, gid)
- if err := os.Chown(path, uid, gid); err != nil {
- return err
- }
- }
- return nil
-}
-
  func (d *diskStore) mkEnvironmentsDir() error {
   path := filepath.Join(d.dir, "environments")
   logger.Debugf("Making %v", path)
@@ -79,9 +65,6 @@
   if os.IsExist(err) {
    return nil
   }
- if err == nil {
- err = ensurePathOwnedByUser(path)
- }
   return err
  }

@@ -101,9 +84,6 @@
    return nil, err
   }
   file.Close()
- if err := ensurePathOwnedByUser(path); err != nil {
- return nil, err
- }
   return &environInfo{
    created: true,
    path: path,
@@ -203,9 +183,6 @@
    os.Remove(tmpFile.Name())
    return fmt.Errorf("cannot rename new environment info file: %v", err)
   }
- if err := ensurePathOwnedByUser(info.path); err != nil {
- return err
- }
   info.initialized = true
   return nil
  }

[Dimiter Naydenov (dimitern)]

LGTM

https://codereview.appspot.com/51150044/

=== modified file 'environs/configstore/disk.go'
--- environs/configstore/disk.go	2014-01-22 22:48:54 +0000
+++ environs/configstore/disk.go	2014-01-26 19:37:25 +0000
@@ -58,20 +58,6 @@
 	return filepath.Join(d.dir, "environments", envName+".jenv")
 }
 
-func ensurePathOwnedByUser(path string) error {
-	uid, gid, err := utils.SudoCallerIds()
-	if err != nil {
-		return err
-	}
-	if uid != 0 {
-		logger.Debugf("Making %v owned by %d:%d", path, uid, gid)
-		if err := os.Chown(path, uid, gid); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func (d *diskStore) mkEnvironmentsDir() error {
 	path := filepath.Join(d.dir, "environments")
 	logger.Debugf("Making %v", path)
@@ -79,9 +65,6 @@
 	if os.IsExist(err) {
 		return nil
 	}
-	if err == nil {
-		err = ensurePathOwnedByUser(path)
-	}
 	return err
 }
 
@@ -101,9 +84,6 @@
 		return nil, err
 	}
 	file.Close()
-	if err := ensurePathOwnedByUser(path); err != nil {
-		return nil, err
-	}
 	return &environInfo{
 		created: true,
 		path:    path,
@@ -203,9 +183,6 @@
 		os.Remove(tmpFile.Name())
 		return fmt.Errorf("cannot rename new environment info file: %v", err)
 	}
-	if err := ensurePathOwnedByUser(info.path); err != nil {
-		return err
-	}
 	info.initialized = true
 	return nil
 }