aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2011-04-26 21:09:12 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2011-04-26 21:09:12 +0000
commit43eac293a02bbbac85e44bf1d22c8b675b34a5ce (patch)
treeba495b4dee67a71e12b36addaf6cfe82b2c50d3c
parent231f57b15db5b784266e60985ceafc43566a804b (diff)
downloadperl-URPM-43eac293a02bbbac85e44bf1d22c8b675b34a5ce.tar
perl-URPM-43eac293a02bbbac85e44bf1d22c8b675b34a5ce.tar.gz
perl-URPM-43eac293a02bbbac85e44bf1d22c8b675b34a5ce.tar.bz2
perl-URPM-43eac293a02bbbac85e44bf1d22c8b675b34a5ce.tar.xz
perl-URPM-43eac293a02bbbac85e44bf1d22c8b675b34a5ce.zip
more cosmetics
-rw-r--r--URPM.xs93
1 files changed, 47 insertions, 46 deletions
diff --git a/URPM.xs b/URPM.xs
index 3b9640d..27ae355 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -3750,56 +3750,57 @@ Trans_run(trans, data, ...)
STRLEN len;
char *s = SvPV(ST(i), len);
- if (len == 4 && !memcmp(s, "test", 4) && SvIV(ST(i+1)))
- transFlags |= RPMTRANS_FLAG_TEST;
- else if (len == 11 && !memcmp(s, "excludedocs", 11) && SvIV(ST(i+1)))
- transFlags |= RPMTRANS_FLAG_NODOCS;
- else if (len == 5) {
- if (!memcmp(s, "force", 5) && SvIV(ST(i+1)))
- probFilter |= (RPMPROB_FILTER_REPLACEPKG |
- RPMPROB_FILTER_REPLACEOLDFILES |
- RPMPROB_FILTER_REPLACENEWFILES |
- RPMPROB_FILTER_OLDPACKAGE);
- else if (!memcmp(s, "delta", 5))
- td.min_delta = SvIV(ST(i+1));
- else if (len == 6 && !memcmp(s, "nosize", 6) && SvIV(ST(i+1)))
- probFilter |= (RPMPROB_FILTER_DISKSPACE|RPMPROB_FILTER_DISKNODES);
- else if (len == 9 && !memcmp(s, "noscripts", 9) && SvIV(ST(i+1)))
- transFlags |= (RPMTRANS_FLAG_NOSCRIPTS |
- RPMTRANS_FLAG_NOPRE |
- RPMTRANS_FLAG_NOPREUN |
- RPMTRANS_FLAG_NOPOST |
- RPMTRANS_FLAG_NOPOSTUN );
- else if (len == 10 && !memcmp(s, "oldpackage", 10) && SvIV(ST(i+1)))
- probFilter |= RPMPROB_FILTER_OLDPACKAGE;
- else if (len == 11 && !memcmp(s, "replacepkgs", 11) && SvIV(ST(i+1)))
- probFilter |= RPMPROB_FILTER_REPLACEPKG;
- else if (len == 11 && !memcmp(s, "raw_message", 11))
+ if (SvIV(ST(i+1))) {
+ if (len == 4 && !memcmp(s, "test", 4))
+ transFlags |= RPMTRANS_FLAG_TEST;
+ else if (len == 11 && !memcmp(s, "excludedocs", 11))
+ transFlags |= RPMTRANS_FLAG_NODOCS;
+ else if (len == 5) {
+ if (!memcmp(s, "force", 5))
+ probFilter |= (RPMPROB_FILTER_REPLACEPKG |
+ RPMPROB_FILTER_REPLACEOLDFILES |
+ RPMPROB_FILTER_REPLACENEWFILES |
+ RPMPROB_FILTER_OLDPACKAGE);
+ else if (!memcmp(s, "delta", 5))
+ td.min_delta = SvIV(ST(i+1));
+ }
+ else if (len == 6 && !memcmp(s, "nosize", 6))
+ probFilter |= (RPMPROB_FILTER_DISKSPACE|RPMPROB_FILTER_DISKNODES);
+ else if (len == 9 && !memcmp(s, "noscripts", 9))
+ transFlags |= (RPMTRANS_FLAG_NOSCRIPTS |
+ RPMTRANS_FLAG_NOPRE |
+ RPMTRANS_FLAG_NOPREUN |
+ RPMTRANS_FLAG_NOPOST |
+ RPMTRANS_FLAG_NOPOSTUN );
+ else if (len == 10 && !memcmp(s, "oldpackage", 10))
+ probFilter |= RPMPROB_FILTER_OLDPACKAGE;
+ else if (len == 11 && !memcmp(s, "replacepkgs", 11))
+ probFilter |= RPMPROB_FILTER_REPLACEPKG;
+ else if (len == 12 && !memcmp(s, "replacefiles", 12))
+ probFilter |= RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES;
+ else if (len == 9 && !memcmp(s, "repackage", 9))
+ transFlags |= RPMTRANS_FLAG_REPACKAGE;
+ else if (len == 6 && !memcmp(s, "justdb", 6))
+ transFlags |= RPMTRANS_FLAG_JUSTDB;
+ else if (len == 10 && !memcmp(s, "ignorearch", 10))
+ probFilter |= RPMPROB_FILTER_IGNOREARCH;
+ else if (len >= 9 && !memcmp(s, "callback_", 9)) {
+ if (len == 9+4 && !memcmp(s+9, "open", 4))
+ td.callback_open = ST(i+1);
+ else if (len == 9+5 && !memcmp(s+9, "close", 5))
+ td.callback_close = ST(i+1);
+ else if (len == 9+5 && !memcmp(s+9, "trans", 5))
+ td.callback_trans = ST(i+1);
+ else if (len == 9+6 && !memcmp(s+9, "uninst", 6))
+ td.callback_uninst = ST(i+1);
+ else if (len == 9+4 && !memcmp(s+9, "inst", 4))
+ td.callback_inst = ST(i+1);
+ }
+ } else if (len == 11 && !memcmp(s, "raw_message", 11))
raw_message = 1;
- else if (len == 12 && !memcmp(s, "replacefiles", 12) && SvIV(ST(i+1)))
- probFilter |= RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES;
- else if (len == 9 && !memcmp(s, "repackage", 9) && SvIV(ST(i+1)))
- transFlags |= RPMTRANS_FLAG_REPACKAGE;
- else if (len == 6 && !memcmp(s, "justdb", 6) && SvIV(ST(i+1)))
- transFlags |= RPMTRANS_FLAG_JUSTDB;
- else if (len == 10 && !memcmp(s, "ignorearch", 10) && SvIV(ST(i+1)))
- probFilter |= RPMPROB_FILTER_IGNOREARCH;
else if (len == 17 && !memcmp(s, "translate_message", 17))
translate_message = 1;
- else if (len >= 9 && !memcmp(s, "callback_", 9) && SvROK(ST(i+1))) {
- if (len == 9+4 && !memcmp(s+9, "open", 4))
- td.callback_open = ST(i+1);
- else if (len == 9+5 && !memcmp(s+9, "close", 5))
- td.callback_close = ST(i+1);
- else if (len == 9+5 && !memcmp(s+9, "trans", 5))
- td.callback_trans = ST(i+1);
- else if (len == 9+6 && !memcmp(s+9, "uninst", 6))
- td.callback_uninst = ST(i+1);
- else if (len == 9+4 && !memcmp(s+9, "inst", 4))
- td.callback_inst = ST(i+1);
- }
}
- }
/* check macros */
{
char *repa = rpmExpand("%_repackage_all_erasures", NULL);