stop sending the fake ubuntu-core-15.04-dev1 to the store

snappy/snap_remote_repo.go

@@ -165,7 +165,7 @@ func setUbuntuStoreHeaders(req *http.Request) {
 
 	// frameworks
 	frameworks, _ := ActiveSnapIterByType(BareName, snap.TypeFramework)
-	req.Header.Set("X-Ubuntu-Frameworks", strings.Join(addCoreFmk(frameworks), ","))
+	req.Header.Set("X-Ubuntu-Frameworks", strings.Join(frameworks, ","))
 	req.Header.Set("X-Ubuntu-Architecture", string(arch.UbuntuArchitecture()))
 	req.Header.Set("X-Ubuntu-Release", release.String())
 	req.Header.Set("X-Ubuntu-Wire-Protocol", UbuntuCoreWireProtocol)

snappy/utils.go

@@ -27,23 +27,6 @@ import (
 	"github.com/ubuntu-core/snappy/helpers"
 )
 
-// FIXME: can we kill this?
-func addCoreFmk(fmks []string) []string {
-	fmkCore := false
-	for _, a := range fmks {
-		if a == "ubuntu-core-15.04-dev1" {
-			fmkCore = true
-			break
-		}
-	}
-
-	if !fmkCore {
-		fmks = append(fmks, "ubuntu-core-15.04-dev1")
-	}
-
-	return fmks
-}
-
 // makeSnapHookEnv returns an environment suitable for passing to
 // os/exec.Cmd.Env
 //