OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-tools Date: 29-Dec-2006 11:00:27 Branch: HEAD Handle: 2006122910002700 Modified files: openpkg-tools/cmd bf-mk.pl Log: enhance Buildfarm robustness by forcibly erasing packages with broken %preun etc. scripts and similar problems Summary: Revision Changes Path 1.47 +8 -1 openpkg-tools/cmd/bf-mk.pl ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-tools/cmd/bf-mk.pl ============================================================================ $ cvs diff -u -r1.46 -r1.47 bf-mk.pl --- openpkg-tools/cmd/bf-mk.pl 27 Oct 2006 19:19:52 -0000 1.46 +++ openpkg-tools/cmd/bf-mk.pl 29 Dec 2006 10:00:27 -0000 1.47 @@ -525,7 +525,14 @@ if [ ".$surplus" = . ]; then echo "instance successfully stripped to baseline" else - die "some unwanted crap remains, need operator help" + echo "force erasing $surplus" + %{workbench.rpm} -e --nodeps --noscripts --notriggers $surplus + surplus=`%{workbench.rpm} -qa | sed -e 's;^openpkg-[^-][^-]*-[^-][^-]*$;;' -e 's;^gpg-pubkey-[^-][^-]*-[^-][^-]*$;;'` + if [ ".$surplus" = . ]; then + echo "instance successfully forced to baseline" + else + die "some unwanted crap remains, need operator help" + fi fi fi } @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org