OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 04-Feb-2004 01:06:10
Branch: HEAD Handle: 2004020400061000
Modified files:
openpkg-re src2make.pl
Log:
ensure removal of packages that were accidentally installed multiple
times (+ bug in filename)
Summary:
Revision Changes Path
1.51 +2 -2 openpkg-re/src2make.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/src2make.pl
============================================================================
$ cvs diff -u -r1.50 -r1.51 src2make.pl
--- openpkg-re/src2make.pl 4 Feb 2004 00:04:42 -0000 1.50
+++ openpkg-re/src2make.pl 4 Feb 2004 00:06:10 -0000 1.51
@@ -725,7 +725,7 @@
# generate uninstall operation
if (not $nouninstall and not $pkg_name eq 'openpkg') {
$MF .= "[EMAIL PROTECTED] \"\$(TERM_B):::: Uninstalling $pkg
::::\$(TERM_N)\"\n";
- $MF .= "\t\$(RPM_RD) -q $pkg >/dev/null && \$(RPM_RW) -e --noscripts $pkg
>/dev/null 2>&1 || true\n";
+ $MF .= "\t\$(RPM_RD) -q $pkg >/dev/null && \$(RPM_RW) -e --noscripts
--allmatches $pkg >/dev/null 2>&1 || true\n";
}
$il = '';
@@ -901,7 +901,7 @@
"\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 >/dev/null 2>&1 || true;
\\\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" .
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
