diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-08-25 06:45:16 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-08-25 06:45:16 +0000 |
| commit | 44731509844946ccd2c2ee1de87901c171dadcc5 (patch) | |
| tree | 83e065c21bd400661e9a594289ec3114cd10d051 /fedora | |
| parent | 4728cb644861ff8c58586702bf6815c50a1c0dd2 (diff) | |
Updated to fedora-glibc-20060825T0639
Diffstat (limited to 'fedora')
| -rw-r--r-- | fedora/branch.mk | 4 | ||||
| -rw-r--r-- | fedora/glibc.spec.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk index 86bc40a3e5..fb723d026c 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -3,5 +3,5 @@ glibc-branch := fedora glibc-base := HEAD DIST_BRANCH := devel COLLECTION := dist-fc4 -fedora-sync-date := 2006-08-22 07:06 UTC -fedora-sync-tag := fedora-glibc-20060822T0706 +fedora-sync-date := 2006-08-25 06:39 UTC +fedora-sync-tag := fedora-glibc-20060825T0639 diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 251854997b..f265ce6a13 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -1142,7 +1142,7 @@ echo ====================TESTING========================= cd build-%{nptl_target_cpu}-linuxnptl ( make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1 sleep 10s - teepid="`ps -eo ppid,pid,command | grep ^${parent}' [0-9]\+ tee' | cut -d' ' -f2`" + teepid="`ps -eo ppid,pid,command | grep ^${parent}'[ ]\+[0-9]\+[ ]\+tee' | cut -d' ' -f2`" [ -n "$teepid" ] && kill $teepid ) | tee check.log || : cd .. @@ -1151,7 +1151,7 @@ echo ====================TESTING -mno-tls-direct-seg-refs============= cd build-%{nptl_target_cpu}-linuxnptl-nosegneg ( make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1 sleep 10s - teepid="`ps -eo ppid,pid,command | grep ^${parent}' [0-9]\+ tee' | cut -d' ' -f2`" + teepid="`ps -eo ppid,pid,command | grep ^${parent}'[ ]\+[0-9]\+[ ]\+tee' | cut -d' ' -f2`" [ -n "$teepid" ] && kill $teepid ) | tee check.log || : cd .. |