cmd: rename ubuntu-core to base

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
snapcore · May 25, 2016 · 9740501 · 9740501
1 parent 80c13b0
commit 9740501
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/cmd/snap/cmd_interfaces.go b/cmd/snap/cmd_interfaces.go
@@ -78,9 +78,10 @@ func (x *cmdInterfaces) Execute(args []string) error {
 			if x.Interface != "" && slot.Interface != x.Interface {
 				continue
 			}
-			// The OS snap (always ubuntu-core) is special and enable abbreviated
+			// The OS snap (always base) is special and enable abbreviated
 			// display syntax on the slot-side of the connection.
-			if slot.Snap == "ubuntu-core" {
+			// TODO: remove ubuntu-core after a while
+			if slot.Snap == "base" || slot.Snap == "ubuntu-core" {
 				fmt.Fprintf(w, ":%s\t", slot.Name)
 			} else {
 				fmt.Fprintf(w, "%s:%s\t", slot.Snap, slot.Name)

diff --git a/cmd/snap/cmd_interfaces_test.go b/cmd/snap/cmd_interfaces_test.go
@@ -299,7 +299,7 @@ func (s *SnapSuite) TestInterfacesOsSnapSlots(c *C) {
 			"result": client.Interfaces{
 				Slots: []client.Slot{
 					{
-						Snap:      "ubuntu-core",
+						Snap:      "base",
 						Name:      "network-listening",
 						Interface: "network-listening",
 						Label:     "Ability to be a network service",
@@ -323,7 +323,7 @@ func (s *SnapSuite) TestInterfacesOsSnapSlots(c *C) {
 						Label:     "Ability to be a network service",
 						Connections: []client.SlotRef{
 							{
-								Snap: "ubuntu-core",
+								Snap: "base",
 								Name: "network-listening",
 							},
 						},
@@ -335,7 +335,7 @@ func (s *SnapSuite) TestInterfacesOsSnapSlots(c *C) {
 						Label:     "Ability to be a network service",
 						Connections: []client.SlotRef{
 							{
-								Snap: "ubuntu-core",
+								Snap: "base",
 								Name: "network-listening",
 							},
 						},
@@ -372,7 +372,7 @@ func (s *SnapSuite) TestInterfacesTwoSlotsAndFiltering(c *C) {
 						Label:     "Serial port on the expansion header",
 						Connections: []client.PlugRef{
 							{
-								Snap: "ubuntu-core",
+								Snap: "base",
 								Name: "debug-console",
 							},
 						},
@@ -398,7 +398,7 @@ func (s *SnapSuite) TestInterfacesTwoSlotsAndFiltering(c *C) {
 	c.Assert(rest, DeepEquals, []string{})
 	expectedStdout := "" +
 		"Slot                         Plug\n" +
-		"canonical-pi2:debug-console  ubuntu-core\n"
+		"canonical-pi2:debug-console  base\n"
 	c.Assert(s.Stdout(), Equals, expectedStdout)
 	c.Assert(s.Stderr(), Equals, "")
 }