From 7a4a7474e86ca80a5cb1eea60b527f0296e9b28c Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 23 Mar 2009 22:33:05 -0500
Subject: [PATCH 1/2] Fix site-watcher tests

---
 extra/site-watcher/site-watcher-tests.factor | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/extra/site-watcher/site-watcher-tests.factor b/extra/site-watcher/site-watcher-tests.factor
index dde5e65e7e..62233587d9 100644
--- a/extra/site-watcher/site-watcher-tests.factor
+++ b/extra/site-watcher/site-watcher-tests.factor
@@ -2,11 +2,14 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: db.tuples locals site-watcher site-watcher.db
 site-watcher.private kernel db io.directories io.files.temp
-continuations db.sqlite site-watcher.db.private ;
+continuations site-watcher.db.private db.sqlite
+sequences tools.test ;
 IN: site-watcher.tests
 
+[ "site-watcher.db" temp-file delete-file ] ignore-errors
+
 :: fake-sites ( -- seq )
-    [
+    "site-watcher.db" temp-file <sqlite-db> [
         account ensure-table
         site ensure-table
         watching-site ensure-table
@@ -17,5 +20,6 @@ IN: site-watcher.tests
 
         "erg@factorcode.org" "http://asdfasdfasdfasdfqwerqqq.com" watch-site
         f <site> select-tuples
-    ] with-sqlite-db ;
+    ] with-db ;
 
+[ f ] [ fake-sites empty? ] unit-test
\ No newline at end of file

From 862223fa79f68cd883e3d776613c853f79034cc3 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 23 Mar 2009 22:36:51 -0500
Subject: [PATCH 2/2] Fix bunny deployment

---
 basis/tools/deploy/shaker/shaker.factor | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index a729e40e2a..55433299ad 100755
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -204,7 +204,8 @@ IN: tools.deploy.shaker
     ] when ;
 
 : strip-vocab-globals ( except names -- words )
-    [ child-vocabs [ words ] map concat ] map concat swap diff ;
+    [ child-vocabs [ words ] map concat ] map concat
+    swap [ first2 lookup ] map sift diff ;
 
 : stripped-globals ( -- seq )
     [
@@ -245,7 +246,8 @@ IN: tools.deploy.shaker
         strip-dictionary? [
             "libraries" "alien" lookup ,
 
-            { } { "cpu" "compiler" } strip-vocab-globals %
+            { { "yield-hook" "compiler.utilities" } }
+            { "cpu" "compiler" } strip-vocab-globals %
 
             {
                 gensym