Merge pull request #7342 from ardaguclu/fixme-rename-arch

fixme: rename ubuntu*architectures to dpkg*architectures

4 files changed, 15 insertions, 15 deletions

diff --git a/snap/channel/channel.go b/snap/channel/channel.go
index 7e57278481..30d652531e 100644
--- a/snap/channel/channel.go
+++ b/snap/channel/channel.go
@@ -69,7 +69,7 @@ func ParseVerbatim(s string, architecture string) (Channel, error) {
	}
 
	if architecture == "" {
-	architecture = arch.UbuntuArchitecture()
+	architecture = arch.DpkgArchitecture()
	}
 
	ch := Channel{
diff --git a/snap/channel/channel_test.go b/snap/channel/channel_test.go
index 62d583eb6f..812a9782b9 100644
--- a/snap/channel/channel_test.go
+++ b/snap/channel/channel_test.go
@@ -38,7 +38,7 @@ func (s storeChannelSuite) TestParse(c *C) {
	ch, err := channel.Parse("stable", "")
	c.Assert(err, IsNil)
	c.Check(ch, DeepEquals, channel.Channel{
-	Architecture: arch.UbuntuArchitecture(),
+	Architecture: arch.DpkgArchitecture(),
	Name: "stable",
	Track: "",
	Risk: "stable",
@@ -48,7 +48,7 @@ func (s storeChannelSuite) TestParse(c *C) {
	ch, err = channel.Parse("latest/stable", "")
	c.Assert(err, IsNil)
	c.Check(ch, DeepEquals, channel.Channel{
-	Architecture: arch.UbuntuArchitecture(),
+	Architecture: arch.DpkgArchitecture(),
	Name: "stable",
	Track: "",
	Risk: "stable",
@@ -58,7 +58,7 @@ func (s storeChannelSuite) TestParse(c *C) {
	ch, err = channel.Parse("1.0/edge", "")
	c.Assert(err, IsNil)
	c.Check(ch, DeepEquals, channel.Channel{
-	Architecture: arch.UbuntuArchitecture(),
+	Architecture: arch.DpkgArchitecture(),
	Name: "1.0/edge",
	Track: "1.0",
	Risk: "edge",
@@ -68,7 +68,7 @@ func (s storeChannelSuite) TestParse(c *C) {
	ch, err = channel.Parse("1.0", "")
	c.Assert(err, IsNil)
	c.Check(ch, DeepEquals, channel.Channel{
-	Architecture: arch.UbuntuArchitecture(),
+	Architecture: arch.DpkgArchitecture(),
	Name: "1.0/stable",
	Track: "1.0",
	Risk: "stable",
@@ -78,7 +78,7 @@ func (s storeChannelSuite) TestParse(c *C) {
	ch, err = channel.Parse("1.0/beta/foo", "")
	c.Assert(err, IsNil)
	c.Check(ch, DeepEquals, channel.Channel{
-	Architecture: arch.UbuntuArchitecture(),
+	Architecture: arch.DpkgArchitecture(),
	Name: "1.0/beta/foo",
	Track: "1.0",
	Risk: "beta",
@@ -88,7 +88,7 @@ func (s storeChannelSuite) TestParse(c *C) {
	ch, err = channel.Parse("candidate/foo", "")
	c.Assert(err, IsNil)
	c.Check(ch, DeepEquals, channel.Channel{
-	Architecture: arch.UbuntuArchitecture(),
+	Architecture: arch.DpkgArchitecture(),
	Name: "candidate/foo",
	Track: "",
	Risk: "candidate",
@@ -116,7 +116,7 @@ func (s storeChannelSuite) TestParseVerbatim(c *C) {
	ch, err := channel.ParseVerbatim("sometrack", "")
	c.Assert(err, IsNil)
	c.Check(ch, DeepEquals, channel.Channel{
-	Architecture: arch.UbuntuArchitecture(),
+	Architecture: arch.DpkgArchitecture(),
	Track: "sometrack",
	})
	c.Check(ch.VerbatimTrackOnly(), Equals, true)
@@ -126,7 +126,7 @@ func (s storeChannelSuite) TestParseVerbatim(c *C) {
	ch, err = channel.ParseVerbatim("latest", "")
	c.Assert(err, IsNil)
	c.Check(ch, DeepEquals, channel.Channel{
-	Architecture: arch.UbuntuArchitecture(),
+	Architecture: arch.DpkgArchitecture(),
	Track: "latest",
	})
	c.Check(ch.VerbatimTrackOnly(), Equals, true)
@@ -146,7 +146,7 @@ func (s storeChannelSuite) TestParseVerbatim(c *C) {
	ch, err = channel.ParseVerbatim("latest/stable", "")
	c.Assert(err, IsNil)
	c.Check(ch, DeepEquals, channel.Channel{
-	Architecture: arch.UbuntuArchitecture(),
+	Architecture: arch.DpkgArchitecture(),
	Track: "latest",
	Risk: "stable",
	})
@@ -157,7 +157,7 @@ func (s storeChannelSuite) TestParseVerbatim(c *C) {
	ch, err = channel.ParseVerbatim("latest/stable/foo", "")
	c.Assert(err, IsNil)
	c.Check(ch, DeepEquals, channel.Channel{
-	Architecture: arch.UbuntuArchitecture(),
+	Architecture: arch.DpkgArchitecture(),
	Track: "latest",
	Risk: "stable",
	Branch: "foo",
diff --git a/snap/snapenv/snapenv.go b/snap/snapenv/snapenv.go
index 58e47980b2..03ae4490bc 100644
--- a/snap/snapenv/snapenv.go
+++ b/snap/snapenv/snapenv.go
@@ -112,7 +112,7 @@ func basicEnv(info *snap.Info) map[string]string {
	"SNAP_INSTANCE_KEY": info.InstanceKey,
	"SNAP_VERSION": info.Version,
	"SNAP_REVISION": info.Revision.String(),
-	"SNAP_ARCH": arch.UbuntuArchitecture(),
+	"SNAP_ARCH": arch.DpkgArchitecture(),
	// see https://github.com/snapcore/snapd/pull/2732#pullrequestreview-18827193
	"SNAP_LIBRARY_PATH": "/var/lib/snapd/lib/gl:/var/lib/snapd/lib/gl32:/var/lib/snapd/void",
	"SNAP_REEXEC": os.Getenv("SNAP_REEXEC"),
diff --git a/snap/snapenv/snapenv_test.go b/snap/snapenv/snapenv_test.go
index afa78fc5c0..030f35ede6 100644
--- a/snap/snapenv/snapenv_test.go
+++ b/snap/snapenv/snapenv_test.go
@@ -82,7 +82,7 @@ func (ts *HTestSuite) TestBasic(c *C) {
 
	c.Assert(env, DeepEquals, map[string]string{
	"SNAP": fmt.Sprintf("%s/foo/17", dirs.CoreSnapMountDir),
-	"SNAP_ARCH": arch.UbuntuArchitecture(),
+	"SNAP_ARCH": arch.DpkgArchitecture(),
	"SNAP_COMMON": "/var/snap/foo/common",
	"SNAP_DATA": "/var/snap/foo/17",
	"SNAP_LIBRARY_PATH": "/var/lib/snapd/lib/gl:/var/lib/snapd/lib/gl32:/var/lib/snapd/void",
@@ -136,7 +136,7 @@ func (s *HTestSuite) TestSnapRunSnapExecEnv(c *C) {
 
	env := snapEnv(info)
	c.Check(env, DeepEquals, map[string]string{
-	"SNAP_ARCH": arch.UbuntuArchitecture(),
+	"SNAP_ARCH": arch.DpkgArchitecture(),
	"SNAP_LIBRARY_PATH": "/var/lib/snapd/lib/gl:/var/lib/snapd/lib/gl32:/var/lib/snapd/void",
	"SNAP_NAME": "snapname",
	"SNAP_INSTANCE_NAME": "snapname",
@@ -178,7 +178,7 @@ func (s *HTestSuite) TestParallelInstallSnapRunSnapExecEnv(c *C) {
 
	env := snapEnv(info)
	c.Check(env, DeepEquals, map[string]string{
-	"SNAP_ARCH": arch.UbuntuArchitecture(),
+	"SNAP_ARCH": arch.DpkgArchitecture(),
	"SNAP_LIBRARY_PATH": "/var/lib/snapd/lib/gl:/var/lib/snapd/lib/gl32:/var/lib/snapd/void",
	"SNAP_NAME": "snapname",
	"SNAP_INSTANCE_NAME": "snapname_foo",