From ad7ec00c29bcf298b6ad0a8e7f4ac0de55e6527e Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Sun, 10 Feb 2008 03:01:20 -0600
Subject: [PATCH 1/2] builder: use base portion of hostname
---
extra/builder/builder.factor | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/extra/builder/builder.factor b/extra/builder/builder.factor
index 7f69f3ef00..8f44093141 100644
--- a/extra/builder/builder.factor
+++ b/extra/builder/builder.factor
@@ -30,7 +30,9 @@ IN: builder
SYMBOL: builder-recipients
-: tag-subject ( str -- str ) `{ "builder@" ,[ host-name ] ": " , } concat ;
+: host-name* ( -- name ) host-name "." split first ;
+
+: tag-subject ( str -- str ) `{ "builder@" ,[ host-name* ] ": " , } concat ;
: email-string ( subject -- )
`{ "mutt" "-s" ,[ tag-subject ] %[ builder-recipients get ] }
@@ -158,11 +160,11 @@ SYMBOL: build-status
builder-test "builder.test fatal error" run-or-notify
"../load-everything-log" exists?
- [ "builder: load-everything" "../load-everything-log" email-file ]
+ [ "load-everything" "../load-everything-log" email-file ]
when
"../failing-tests" exists?
- [ "builder: failing tests" "../failing-tests" email-file ]
+ [ "failing tests" "../failing-tests" email-file ]
when
"ready" build-status set-global ;
From e7bf56ad57398e586e109b51b20a1e576d866d27 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Sun, 10 Feb 2008 03:05:34 -0600
Subject: [PATCH 2/2] builder: fix run-or-send-file bug
---
extra/builder/builder.factor | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extra/builder/builder.factor b/extra/builder/builder.factor
index 8f44093141..a17afb9d55 100644
--- a/extra/builder/builder.factor
+++ b/extra/builder/builder.factor
@@ -56,7 +56,7 @@ SYMBOL: builder-recipients
: run-or-send-file ( desc message file -- )
>r >r [ try-process ] curry
- r> r> [ email-string throw ] 2curry
+ r> r> [ email-file throw ] 2curry
recover ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!