From ce94787185613355bc5e405cc95f836bf7bf622a Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 30 Aug 2017 12:48:39 +0200
Subject: bin/build-master-status: also understand "and" besides "or" in
 .blocked

---
 bin/build-master-status | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/build-master-status')

diff --git a/bin/build-master-status b/bin/build-master-status
index 3397bae..1e6e4c3 100755
--- a/bin/build-master-status
+++ b/bin/build-master-status
@@ -269,7 +269,7 @@ if ${web}; then
             sed '
               s|FS#\([0-9]\+\)|<a href="https://bugs.archlinux.org/task/\1">FS#\1</a>|
               /FS#[0-9]\+/!s|^\(wait for \)\(\S\+\) $|\1<a href="graphs/\2.png">\2</a> |
-              /FS#[0-9]\+/!s|^\(wait for \)\(\S\+\) or \(\S\+\) $|\1<a href="graphs/\2.png">\2</a> or <a href="graphs/\3.png">\3</a> |
+              /FS#[0-9]\+/!s|^\(wait for \)\(\S\+\) \(or\|and\) \(\S\+\) $|\1<a href="graphs/\2.png">\2</a> \3 <a href="graphs/\4.png">\4</a> |
             '
         else
           printf '&nbsp;'
-- 
cgit v1.2.3-54-g00ecf