From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 1 Apr 2015 11:44:29 +0000 (+0100)
Subject: libguestfs_fedora: Change memory key to include branch name.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=986aab424a519bf5ade0106d4d5c026e3833b2d3;p=goaljobs-goals.git

libguestfs_fedora: Change memory key to include branch name.

Because f22 and rawhide branches are using the same version, the key
needs to include more than just the version number to be distinguished
between branches.
---

diff --git a/libguestfs_fedora.ml b/libguestfs_fedora.ml
index c101613..56057ec 100644
--- a/libguestfs_fedora.ml
+++ b/libguestfs_fedora.ml
@@ -94,7 +94,8 @@ and specfile_updated version branch =
 
 and specfile_committed version branch =
   let repodir = fedora_repo package branch in
-  let key = sprintf "libguestfs_fedora_specfile_committed_%s" version.version in
+  let key = sprintf "libguestfs_fedora_specfile_committed_%s_%s"
+    branch version.version in
 
   target (memory_exists key);
   onrun (fun () -> memory_set key "1");
@@ -108,7 +109,8 @@ and specfile_committed version branch =
 
 and specfile_pushed version branch =
   let repodir = fedora_repo package branch in
-  let key = sprintf "libguestfs_fedora_specfile_pushed_%s" version.version in
+  let key =
+    sprintf "libguestfs_fedora_specfile_pushed_%s_%s" branch version.version in
 
   target (memory_exists key);
   onrun (fun () -> memory_set key "1");