Merge lp:~dave-cheney/juju-core/128-environs-sync-tempdir-prefix into lp:~go-bot/juju-core/trunk

Proposed by Dave Cheney
Status: Merged
Approved by: Dave Cheney
Approved revision: no longer in the source branch.
Merged at revision: 2601
Proposed branch: lp:~dave-cheney/juju-core/128-environs-sync-tempdir-prefix
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
environs/sync/sync.go (+1/-1)
To merge this branch: bzr merge lp:~dave-cheney/juju-core/128-environs-sync-tempdir-prefix
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+215087@code.launchpad.net

Commit message

environs/sync: use a tempdir prefix

environs/sync tests create half a dozen copies of temporary tools in /tmp. This change gives them a known prefix so it is possible to clean them up later.

Description of the change

environs/sync: use a tempdir prefix

environs/sync tests create half a dozen copies of temporary tools in /tmp. This change gives them a known prefix so it is possible to clean them up later.

https://codereview.appspot.com/86370045/

To post a comment you must log in.
Revision history for this message
Dave Cheney (dave-cheney) wrote :

Reviewers: mp+215087_code.launchpad.net,

Message:
Please take a look.

Description:
environs/sync: use a tempdir prefix

environs/sync tests create half a dozen copies of temporary tools in
/tmp. This change gives them a known prefix so it is possible to clean
them up later.

https://code.launchpad.net/~dave-cheney/juju-core/128-environs-sync-tempdir-prefix/+merge/215087

(do not edit description out of merge proposal)

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

Affected files (+3, -1 lines):
   A [revision details]
   M environs/sync/sync.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-20140410053917-gc4krsf99t41zy4c
+New revision: <email address hidden>

Index: environs/sync/sync.go
=== modified file 'environs/sync/sync.go'
--- environs/sync/sync.go 2014-03-21 03:27:16 +0000
+++ environs/sync/sync.go 2014-04-10 06:53:27 +0000
@@ -293,7 +293,7 @@
   }
   size := fileInfo.Size()
   logger.Infof("built tools %v (%dkB)", toolsVersion, (size+512)/1024)
- baseToolsDir, err := ioutil.TempDir("", "")
+ baseToolsDir, err := ioutil.TempDir("", "juju-tools")
   if err != nil {
    return nil, err
   }

Revision history for this message
Andrew Wilkins (axwalk) wrote :

On 2014/04/10 06:57:08, dfc wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/86370045/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'environs/sync/sync.go'
2--- environs/sync/sync.go 2014-03-21 03:27:16 +0000
3+++ environs/sync/sync.go 2014-04-10 06:56:52 +0000
4@@ -293,7 +293,7 @@
5 }
6 size := fileInfo.Size()
7 logger.Infof("built tools %v (%dkB)", toolsVersion, (size+512)/1024)
8- baseToolsDir, err := ioutil.TempDir("", "")
9+ baseToolsDir, err := ioutil.TempDir("", "juju-tools")
10 if err != nil {
11 return nil, err
12 }

Subscribers

People subscribed via source and target branches

to status/vote changes: