OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-re Date: 09-Feb-2004 16:36:50 Branch: HEAD Handle: 2004020915365000 Modified files: openpkg-re src2make.pl Log: fix erasing of instance by using a more modern variant Summary: Revision Changes Path 1.53 +2 -18 openpkg-re/src2make.pl ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-re/src2make.pl ============================================================================ $ cvs diff -u -r1.52 -r1.53 src2make.pl --- openpkg-re/src2make.pl 4 Feb 2004 00:06:55 -0000 1.52 +++ openpkg-re/src2make.pl 9 Feb 2004 15:36:50 -0000 1.53 @@ -898,24 +898,8 @@ $MF .= "# erase\n" . "erase:\n" . - "[EMAIL PROTECTED] 'BEGIN { printf(\"erasing packages: \"); }' </dev/null 1>&2; \\\n" . - "\tPKG=\"`\$(MAKE) \$(MFLAGS) erase-helper`\"; \\\n" . - "\twhile [ \".\$\$PKG\" != . ]; do \\\n" . - "\t awk 'BEGIN { printf(\".\"); }' </dev/null 1>&2; \\\n" . - "\t \$(EXEC_ROOT) \$(PREFIX)/bin/rpm -e \$\$PKG --allmatches >/dev/null 2>&1 || true; \\\n" . - "\t PKG_NEW=\"`\$(MAKE) \$(MFLAGS) erase-helper`\"; \\\n" . - "\t if [ \".\$\$PKG_NEW\" = \".\$\$PKG\" ]; then \\\n" . - "\t break; \\\n" . - "\t else \\\n" . - "\t PKG=\"\$\$PKG_NEW\"; \\\n" . - "\t fi; \\\n" . - "\tdone; \\\n" . - "\techo \"done\" 1>&2\n" . - "\n" . - "erase-helper:\n" . - "[EMAIL PROTECTED](PREFIX)/bin/rpm -qa --qf '%{NAME}-%{VERSION}-%{RELEASE}::,[%{REQUIRENAME},]\\n' | \\\n" . - "\t sed -e 's;,rpmlib([^)]*);;g' -e 's;,OpenPKG,;,;g' -e 's;,openpkg,;,;' -e 's;::,;::;' -e 's;,\$\$;;' | \\\n" . - "\t grep '::\$\$' | sed -e 's;::\$\$;;' | grep -v '^openpkg-[0-9].*' | grep -v '^gpg-pubkey-.*' || true\n" . + "[EMAIL PROTECTED](EXEC_ROOT) \$(PREFIX)/bin/rpm -e \\\n" . + "\t `\$(PREFIX)/bin/rpm -qa | sed -e '/^openpkg-[0-9].*/d' -e '/^gpg-pubkey-.*/d'`\n" . "\n"; &verbose("writing Makefile"); @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]