From: George Dunlap <george.dunlap@citrix.com>
Date: Fri, 15 Sep 2017 14:52:09 +0000 (+0100)
Subject: recipe: Bring patch name for master in line with standard practice
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7f5ffe4125c74b549c7181feb63987153b73ada4;p=people%2Fgdunlap%2Fxsatool

recipe: Bring patch name for master in line with standard practice

Standard practice is to have the patch that applies to master be
simply "xsaNNN.patch" (or xsaNNN/*.patch in case of a series).

Signed-off-by: George Dunlap <george.dunlap@citrix.com>
---

diff --git a/recipe.go b/recipe.go
index d71ebc8..68d009b 100644
--- a/recipe.go
+++ b/recipe.go
@@ -187,7 +187,7 @@ func (r *Recipe) MakePatches(prefix string, sync bool) (count int, err error) {
 		// qemuu: xsaNNN-qemuu[-VVV][.patch]
 		// qemut: xsaNNN-qemut[-VVV][.patch]
 		//
-		// 'unstable' if VVV is 'master'
+		// Nothing if VVV is 'master'
 
 		xsabase := fmt.Sprintf("xsa%d", r.xsa)
 
@@ -195,9 +195,7 @@ func (r *Recipe) MakePatches(prefix string, sync bool) (count int, err error) {
 			xsabase += "-" + tree.String()
 		}
 
-		if r.XenVersion == "master" {
-			xsabase += "-unstable"
-		} else {
+		if r.XenVersion != "master" {
 			xsabase += "-" + r.XenVersion.String()
 		}