Move github.com/juju/juju/juju/os to github.com/juju/utils/os

modongsongrio · Sep 18, 2015 · e3a77d3 · e3a77d3
1 parent 87c527b
commit e3a77d3
Show file tree

Hide file tree

Showing 45 changed files with 38 additions and 225 deletions.
diff --git a/agent/tools/tools_test.go b/agent/tools/tools_test.go
@@ -39,7 +39,7 @@ func (t *ToolsSuite) TestPackageDependencies(c *gc.C) {
 	// resulting slice has that prefix removed to keep the output short.
 	c.Assert(testing.FindJujuCoreImports(c, "github.com/juju/juju/agent/tools"),
 		gc.DeepEquals,
-		[]string{"juju/arch", "juju/os", "juju/series", "tools", "version"})
+		[]string{"juju/arch", "juju/series", "tools", "version"})
 }
 
 const toolsFile = "downloaded-tools.txt"

diff --git a/cloudconfig/cloudinit/interface.go b/cloudconfig/cloudinit/interface.go
@@ -9,13 +9,13 @@ package cloudinit
 
 import (
 	"github.com/juju/errors"
+	"github.com/juju/utils/os"
 	"github.com/juju/utils/packaging"
 	"github.com/juju/utils/packaging/commands"
 	"github.com/juju/utils/packaging/config"
 	"github.com/juju/utils/proxy"
 	"github.com/juju/utils/shell"
 
-	"github.com/juju/juju/juju/os"
 	"github.com/juju/juju/juju/series"
 )
 

diff --git a/cloudconfig/userdatacfg.go b/cloudconfig/userdatacfg.go
@@ -10,11 +10,11 @@ import (
 	"github.com/juju/errors"
 	"github.com/juju/names"
 	"github.com/juju/utils"
+	"github.com/juju/utils/os"
 
 	"github.com/juju/juju/agent"
 	"github.com/juju/juju/cloudconfig/cloudinit"
 	"github.com/juju/juju/cloudconfig/instancecfg"
-	"github.com/juju/juju/juju/os"
 	"github.com/juju/juju/juju/series"
 )
 

diff --git a/cloudconfig/userdatacfg_unix.go b/cloudconfig/userdatacfg_unix.go
@@ -19,13 +19,13 @@ import (
 	"github.com/juju/loggo"
 	"github.com/juju/names"
 	"github.com/juju/utils"
+	"github.com/juju/utils/os"
 	"github.com/juju/utils/proxy"
 	goyaml "gopkg.in/yaml.v1"
 
 	"github.com/juju/juju/cloudconfig/cloudinit"
 	"github.com/juju/juju/environs/config"
 	"github.com/juju/juju/environs/imagemetadata"
-	"github.com/juju/juju/juju/os"
 	"github.com/juju/juju/juju/series"
 	"github.com/juju/juju/service"
 	"github.com/juju/juju/service/systemd"

diff --git a/cmd/jujud/run.go b/cmd/jujud/run.go
@@ -17,9 +17,9 @@ import (
 
 	"github.com/juju/juju/agent"
 	cmdutil "github.com/juju/juju/cmd/jujud/util"
-	jujuos "github.com/juju/juju/juju/os"
 	"github.com/juju/juju/juju/sockets"
 	"github.com/juju/juju/worker/uniter"
+	jujuos "github.com/juju/utils/os"
 )
 
 type RunCommand struct {

diff --git a/cmd/jujud/run_test.go b/cmd/jujud/run_test.go
@@ -21,9 +21,9 @@ import (
 	gc "gopkg.in/check.v1"
 
 	cmdutil "github.com/juju/juju/cmd/jujud/util"
-	jujuos "github.com/juju/juju/juju/os"
 	"github.com/juju/juju/testing"
 	"github.com/juju/juju/worker/uniter"
+	jujuos "github.com/juju/utils/os"
 )
 
 type RunTestSuite struct {

diff --git a/dependencies.tsv b/dependencies.tsv
@@ -27,7 +27,7 @@ github.com/juju/schema	git	afe1151cb49d1d7ed3c75592dfc6f38703f2e988	2015-08-07T0
 github.com/juju/syslog	git	6be94e8b718766e9ff7a37342157fe4795da7cfa	2015-02-05T15:59:36Z
 github.com/juju/testing	git	31ee64312c3c64cc94a5b41ea7a200b42e0f9767	2015-09-02T15:44:51Z
 github.com/juju/txn	git	99ec629d0066a4d73c54d8e021a7fc1dc07df614	2015-06-09T16:58:27Z
-github.com/juju/utils	git	03357ca1fc29e4a2b9189c82906475b6bc34f84a	2015-09-10T03:07:18Z
+github.com/juju/utils	git	6262db9d409f4162c8e5250ad9aa9732cc6262a4	2015-09-10T03:07:18Z
 github.com/juju/xml	git	eb759a627588d35166bc505fceb51b88500e291e	2015-04-13T13:11:21Z
 golang.org/x/crypto	git	c57d4a71915a248dbad846d60825145062b4c18e	2015-03-27T05:11:19Z
 golang.org/x/net	git	bb64f4dc73d4ab97978d5e1cb34515dcc570361b	2015-05-18T01:39:50Z

diff --git a/environs/manual/provisioner_test.go b/environs/manual/provisioner_test.go
@@ -20,10 +20,10 @@ import (
 	envtesting "github.com/juju/juju/environs/testing"
 	envtools "github.com/juju/juju/environs/tools"
 	"github.com/juju/juju/instance"
-	jujuos "github.com/juju/juju/juju/os"
 	"github.com/juju/juju/juju/testing"
 	coretesting "github.com/juju/juju/testing"
 	"github.com/juju/juju/version"
+	jujuos "github.com/juju/utils/os"
 )
 
 type provisionerSuite struct {

diff --git a/juju/os/os.go b/juju/os/os.go
diff --git a/juju/os/os_darwin.go b/juju/os/os_darwin.go
diff --git a/juju/os/os_linux.go b/juju/os/os_linux.go
diff --git a/juju/os/os_test.go b/juju/os/os_test.go
diff --git a/juju/os/os_unknown.go b/juju/os/os_unknown.go
diff --git a/juju/os/os_windows.go b/juju/os/os_windows.go
diff --git a/juju/os/package_test.go b/juju/os/package_test.go
diff --git a/juju/paths/paths.go b/juju/paths/paths.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/juju/errors"
 
-	jujuos "github.com/juju/juju/juju/os"
 	"github.com/juju/juju/juju/series"
+	jujuos "github.com/juju/utils/os"
 )
 
 type osVarType int

diff --git a/juju/series/series.go b/juju/series/series.go
@@ -10,8 +10,7 @@ import (
 
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
-
-	"github.com/juju/juju/juju/os"
+	"github.com/juju/utils/os"
 )
 
 var logger = loggo.GetLogger("juju.juju.series")

diff --git a/juju/series/series_linux.go b/juju/series/series_linux.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"strings"
 
-	jujuos "github.com/juju/juju/juju/os"
+	jujuos "github.com/juju/utils/os"
 )
 
 var (

diff --git a/juju/series/supportedseries.go b/juju/series/supportedseries.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 
 	"github.com/juju/errors"
-	jujuos "github.com/juju/juju/juju/os"
+	jujuos "github.com/juju/utils/os"
 )
 
 type unknownOSForSeriesError string

diff --git a/juju/series/supportedseries_linux_test.go b/juju/series/supportedseries_linux_test.go
@@ -9,9 +9,9 @@ import (
 	"sort"
 
 	jc "github.com/juju/testing/checkers"
+	"github.com/juju/utils/os"
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/juju/juju/os"
 	"github.com/juju/juju/juju/series"
 )
 

diff --git a/juju/series/supportedseries_test.go b/juju/series/supportedseries_test.go
@@ -5,9 +5,9 @@ package series_test
 
 import (
 	jc "github.com/juju/testing/checkers"
+	"github.com/juju/utils/os"
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/juju/juju/os"
 	"github.com/juju/juju/juju/series"
 	"github.com/juju/juju/testing"
 )

diff --git a/provider/local/environprovider.go b/provider/local/environprovider.go
@@ -23,9 +23,9 @@ import (
 	"github.com/juju/juju/environs"
 	"github.com/juju/juju/environs/config"
 	"github.com/juju/juju/instance"
-	jujuos "github.com/juju/juju/juju/os"
 	"github.com/juju/juju/juju/osenv"
 	"github.com/juju/juju/version"
+	jujuos "github.com/juju/utils/os"
 )
 
 var logger = loggo.GetLogger("juju.provider.local")

diff --git a/provider/local/environprovider_test.go b/provider/local/environprovider_test.go
@@ -20,10 +20,10 @@ import (
 	"github.com/juju/juju/environs/config"
 	envtesting "github.com/juju/juju/environs/testing"
 	"github.com/juju/juju/instance"
-	jujuos "github.com/juju/juju/juju/os"
 	"github.com/juju/juju/provider"
 	"github.com/juju/juju/provider/local"
 	coretesting "github.com/juju/juju/testing"
+	jujuos "github.com/juju/utils/os"
 )
 
 type baseProviderSuite struct {

diff --git a/provider/maas/environ.go b/provider/maas/environ.go
@@ -19,6 +19,7 @@ import (
 
 	"github.com/juju/errors"
 	"github.com/juju/utils"
+	"github.com/juju/utils/os"
 	"github.com/juju/utils/set"
 	"gopkg.in/mgo.v2/bson"
 	"launchpad.net/gomaasapi"
@@ -32,7 +33,6 @@ import (
 	"github.com/juju/juju/environs/config"
 	"github.com/juju/juju/environs/storage"
 	"github.com/juju/juju/instance"
-	"github.com/juju/juju/juju/os"
 	"github.com/juju/juju/juju/series"
 	"github.com/juju/juju/network"
 	"github.com/juju/juju/provider/common"

diff --git a/service/discovery.go b/service/discovery.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/juju/errors"
 	"github.com/juju/utils/featureflag"
+	"github.com/juju/utils/os"
 	"github.com/juju/utils/shell"
 
 	"github.com/juju/juju/feature"
-	"github.com/juju/juju/juju/os"
 	"github.com/juju/juju/juju/series"
 	"github.com/juju/juju/service/common"
 	"github.com/juju/juju/service/systemd"
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ import ( @@
     	"os"
     	"strings"
-    	jujuos "github.com/juju/juju/juju/os"
+    	jujuos "github.com/juju/utils/os"
     )
     var (
@@ Expand Down @@