WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-api

[Xen-API] [PATCH] fix broken rebase - mea culpa

To: xen-api@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-API] [PATCH] fix broken rebase - mea culpa
From: David Scott <dave.scott@xxxxxxxxxxxxx>
Date: Thu, 4 Feb 2010 18:42:58 +0000
Delivery-date: Thu, 04 Feb 2010 10:35:39 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-api-request@lists.xensource.com?subject=help>
List-id: Discussion of API issues surrounding Xen <xen-api.lists.xensource.com>
List-post: <mailto:xen-api@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-api>, <mailto:xen-api-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-api>, <mailto:xen-api-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-api-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User David Scott <dave.scott@xxxxxxxxxxxxx>
# Date 1265308953 0
# Node ID 25ccf85b0d062d9f0c9edf5274b0c7e3b6f7ab02
# Parent  53f2cc830854588348178e30d544bda99acdfd84
A rebase error broke 688:ad39bb223791: this should fix it.

Signed-off-by: David Scott <dave.scott@xxxxxxxxxxxxx>

diff -r 53f2cc830854 -r 25ccf85b0d06 ocaml/license/restrictions.ml
--- a/ocaml/license/restrictions.ml     Thu Feb 04 18:27:52 2010 +0000
+++ b/ocaml/license/restrictions.ml     Thu Feb 04 18:42:33 2010 +0000
@@ -267,10 +267,12 @@
        let hosts = List.map (fun (_, host_r) -> 
host_r.API.host_license_params) (Db.Host.get_all_records ~__context) in
        let new_restrictions = pool_restrictions_of_list (List.map 
of_assoc_list hosts) in
        if new_restrictions <> !pool_restrictions then begin
-        info "Old pool restrictions: %s" (to_compact_string 
!pool_restrictions);
-        info "New pool restrictions: %s" (to_compact_string new_restrictions);
-        pool_restrictions := new_restrictions
-       end
+                info "Old pool restrictions: %s" (to_compact_string 
!pool_restrictions);
+                info "New pool restrictions: %s" (to_compact_string 
new_restrictions);
+                pool_restrictions := new_restrictions
+       end;
+       let pool = List.hd (Db.Pool.get_all ~__context) in
+       Db.Pool.set_restrictions ~__context ~self:pool ~value:(to_assoc_list 
new_restrictions)
     )
 
 let license_ok_for_wlb ~__context =
@@ -285,5 +287,5 @@
 let ok_for_checkpoint () =
        (get_pool()).enable_checkpoint
 
-let license_ok_for_dmc ~__context = 
+let license_ok_for_vswitch_controller ~__context = 
   (get_pool()).enable_vswitch_controller
1 file changed, 7 insertions(+), 5 deletions(-)
ocaml/license/restrictions.ml |   12 +++++++-----


Attachment: xen-api.hg.patch
Description: Text Data

_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api
<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-API] [PATCH] fix broken rebase - mea culpa, David Scott <=