]> xenbits.xensource.com Git - people/gdunlap/xsatool/commitdiff
recipe: Bring patch name for master in line with standard practice
authorGeorge Dunlap <george.dunlap@citrix.com>
Fri, 15 Sep 2017 14:52:09 +0000 (15:52 +0100)
committerGeorge Dunlap <george.dunlap@citrix.com>
Fri, 15 Sep 2017 14:52:09 +0000 (15:52 +0100)
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>
recipe.go

index d71ebc8d0702b259b64c1aec41774cbaf645bd2b..68d009be1d45e541007415de52f95b0675e59126 100644 (file)
--- 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()
                }