fix a stupid bug where some expr don't match, use extended expressions
to simplify things.
This commit is contained in:
parent
c16d486420
commit
8e15a36e97
@ -1,6 +1,6 @@
|
||||
#!/usr/bin/perl
|
||||
|
||||
# $OpenBSD: portslogger,v 1.12 2004/11/10 10:15:42 espie Exp $
|
||||
# $OpenBSD: portslogger,v 1.13 2005/01/08 00:05:16 espie Exp $
|
||||
# Copyright (c) 2001 Marc Espie. All rights reserved.
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
@ -94,12 +94,26 @@ my $ncontext = undef;
|
||||
my $context;
|
||||
|
||||
while (<>) {
|
||||
if (m/^\=\=\=\>\s+(?:(?:Extracting|Applying distribution patches|\
|
||||
Patching|Configuring|Building|Faking installation|Building package|\
|
||||
Deinstalling|Cleaning|Dist cleaning|Checking files|\
|
||||
Regression check|Updating plist|Updating|\
|
||||
Registering installation)\s+for\s+(.*)|\
|
||||
Returning to build of\s+(.*)|Installing\s+(.*?)\s+from)/o) {
|
||||
if (m/^\=\=\=\>\s+
|
||||
(?:
|
||||
(?: Extracting|
|
||||
Applying\ distribution\ patches|
|
||||
Patching|
|
||||
Configuring|
|
||||
Building|
|
||||
Faking\ installation|
|
||||
Building\ package|
|
||||
Deinstalling|
|
||||
Cleaning|
|
||||
Dist\ cleaning|
|
||||
Checking\ files|
|
||||
Regression\ check|
|
||||
Updating\ plist|
|
||||
Updating|
|
||||
Registering\ installation)\s+for\s+(.*)|
|
||||
Returning\ to\ build\ of\s+(.*)|
|
||||
Installing\s+(.*?)\s+from)
|
||||
/ox) {
|
||||
$ncontext = "$1$2$3"; # XXX only one alternative matches
|
||||
chomp $ncontext;
|
||||
# register to `master' context.
|
||||
|
Loading…
Reference in New Issue
Block a user