Merge lp:~stevenwilkin/snapweb/snaps-always-have-origins into lp:~snappy-dev/snapweb/trunk

[Steven Wilkin]

Snaps always have origins

[John Lenton (chipaca)]

As I said on IRC: if this breaks stuff, all the pieces are yours, so ... :-)

review: Approve

[Sergio Schvezov (sergiusens)]

I'm not sure how far back this would work, luckily we are only targeting rolling, so +1

review: Approve

=== modified file 'snappy/converge.go'
--- snappy/converge.go	2015-12-15 14:22:40 +0000
+++ snappy/converge.go	2015-12-15 14:22:40 +0000
@@ -225,16 +225,13 @@
 	return snapPkgs
 }
 
-func isOriginless(snap snappy.Part) bool {
-	return snap.Type() == pkg.TypeOem || snap.Type() == pkg.TypeFramework
-}
-
 func hasPortInformation(snap snappy.Part) bool {
 	return snap.Type() == pkg.TypeApp || snap.Type() == pkg.TypeFramework
 }
 
 func (h *Handler) snapQueryToPayload(snapQ snappy.Part) snapPkg {
 	snap := snapPkg{
+		ID:          snapQ.Name() + "." + snapQ.Origin(),
 		Name:        snapQ.Name(),
 		Origin:      snapQ.Origin(),
 		Version:     snapQ.Version(),
@@ -242,12 +239,6 @@
 		Type:        snapQ.Type(),
 	}
 
-	if isOriginless(snapQ) {
-		snap.ID = snapQ.Name()
-	} else {
-		snap.ID = snapQ.Name() + "." + snapQ.Origin()
-	}
-
 	if hasPortInformation(snapQ) {
 		if snapInstalled, ok := snapQ.(snappy.ServiceYamler); ok {
 			port, uri := uiAccess(snapInstalled.ServiceYamls())