Merge lp:~axwalk/juju-core/sshstorage-sudo-prompt-1.16 into lp:juju-core/1.16

[Andrew Wilkins]

environs/sshstorage: don't hide sudo prompt

Connect sudo command's stdout to os.Stdout,
and capture stderr in a bytes.Buffer. This
allows sudo prompts to be presented, while
still capturing "install" errors.

Fixes #1235716

https://codereview.appspot.com/14461044/

environs/sshstorage: don't hide sudo prompt

Connect sudo command's stdout to os.Stdout,
and capture stderr in a bytes.Buffer. This
allows sudo prompts to be presented, while
still capturing "install" errors.

Fixes #1235716

https://codereview.appspot.com/14461044/

=== modified file 'environs/sshstorage/storage.go'
--- environs/sshstorage/storage.go	2013-10-03 08:34:41 +0000
+++ environs/sshstorage/storage.go	2013-10-10 01:34:31 +0000
@@ -84,8 +84,11 @@
 
 	cmd := sshCommand(host, true, fmt.Sprintf("sudo bash -c %s", utils.ShQuote(script)))
 	cmd.Stdin = os.Stdin
-	if out, err := cmd.CombinedOutput(); err != nil {
-		err = fmt.Errorf("failed to create storage dir: %v (%v)", err, strings.TrimSpace(string(out)))
+	cmd.Stdout = os.Stdout // for sudo prompts/output
+	var stderr bytes.Buffer
+	cmd.Stderr = &stderr
+	if err := cmd.Run(); err != nil {
+		err = fmt.Errorf("failed to create storage dir: %v (%v)", err, strings.TrimSpace(stderr.String()))
 		return nil, err
 	}
 

=== modified file 'environs/sshstorage/storage_test.go'
--- environs/sshstorage/storage_test.go	2013-10-03 08:44:30 +0000
+++ environs/sshstorage/storage_test.go	2013-10-10 01:34:31 +0000
@@ -162,7 +162,7 @@
 		invocations++
 		switch invocations {
 		case 1, 3:
-			return exec.Command("bash", "-c", "echo alles gut")
+			return exec.Command("true")
 		case 2:
 			// Note: must close stdin before responding the first time, or
 			// the second command will race with closing stdin, and may