From 80e2af827e380198fea4e77583adf9a1bdde01dc Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 5 Oct 2012 16:04:32 +0000 Subject: (Trans_run) drop support for repackage (non working since rpm-4.6 in 2009) should have been done right after commit r251061 by pixel on Tue Jan 2009: "- drop urpmi.recover (no more possible with rpm 4.6 which doesn't handle --repackage)" --- NEWS | 2 ++ URPM.xs | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index 56862b9..a4d13a6 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- drop support for repackage (non working since rpm-4.6 in 2009) + Version 4.15 - 26 September 2012 - API: diff --git a/URPM.xs b/URPM.xs index 997580d..a2b6db7 100644 --- a/URPM.xs +++ b/URPM.xs @@ -2749,8 +2749,6 @@ Trans_run(trans, data, ...) raw_message = 1; } else if (len == 12 && !memcmp(s, "replacefiles", 12)) { if (SvIV(ST(i+1))) probFilter |= RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES; - } else if (len == 9 && !memcmp(s, "repackage", 9)) { - if (SvIV(ST(i+1))) transFlags |= RPMTRANS_FLAG_REPACKAGE; } else if (len == 6 && !memcmp(s, "justdb", 6)) { if (SvIV(ST(i+1))) transFlags |= RPMTRANS_FLAG_JUSTDB; } else if (len == 10 && !memcmp(s, "ignorearch", 10)) { @@ -2772,12 +2770,6 @@ Trans_run(trans, data, ...) } } /* check macros */ - { - char *repa = rpmExpand("%_repackage_all_erasures", NULL); - if (repa && *repa && *repa != '0') - transFlags |= RPMTRANS_FLAG_REPACKAGE; - if (repa) free(repa); - } rpmtsSetFlags(trans->ts, transFlags); trans->ts = rpmtsLink(trans->ts); rpmtsSetNotifyCallback(trans->ts, rpmRunTransactions_callback, &td); -- cgit v1.2.1