aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2011-04-26 20:47:38 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2011-04-26 20:47:38 +0000
commitce28e4550ec0845c28b75efd88c42df63dd91d75 (patch)
tree7347730078974289404f2a49f60e74a626a3f490
parent3090f72d67ca15e2d6f4c31742094489247f3669 (diff)
downloadperl-URPM-ce28e4550ec0845c28b75efd88c42df63dd91d75.tar
perl-URPM-ce28e4550ec0845c28b75efd88c42df63dd91d75.tar.gz
perl-URPM-ce28e4550ec0845c28b75efd88c42df63dd91d75.tar.bz2
perl-URPM-ce28e4550ec0845c28b75efd88c42df63dd91d75.tar.xz
perl-URPM-ce28e4550ec0845c28b75efd88c42df63dd91d75.zip
add support for nofdigests
-rw-r--r--NEWS1
-rw-r--r--URPM.xs12
2 files changed, 9 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index de9b8aa..e75c8e3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
Version 4.22 - 25 April 2011, by Per Øyvind Karlsen
+- add support for nofdigests
- fix getting expected NVRA tag
- fix possible breakage when trying to load non-existant dependency flags
- fix provide flags not being loaded for headers read from rpm files
diff --git a/URPM.xs b/URPM.xs
index d4f55ad..3b9640d 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -4194,10 +4194,14 @@ Urpm_verify_rpm(filename, ...)
for (i = 1 ; i < items - 1 ; i += 2) {
STRLEN len;
char *s = SvPV(ST(i), len);
- if (len == 9 && !strncmp(s, "nodigests", 9) && SvIV(ST(i+1)))
- qva.qva_flags &= ~VERIFY_DIGEST;
- else if (len == 12 && !strncmp(s, "nosignatures", 12) && SvIV(ST(i+1)))
- qva.qva_flags &= ~VERIFY_SIGNATURE;
+ if (SvIV(ST(i+1))) {
+ if (len == 9 && !strncmp(s, "nodigests", 9))
+ qva.qva_flags &= ~VERIFY_DIGEST;
+ else if (len == 10 && !strncmp(s, "nofdigests", 10))
+ qva.qva_flags &= ~VERIFY_FDIGEST;
+ else if (len == 12 && !strncmp(s, "nosignatures", 12))
+ qva.qva_flags &= ~VERIFY_SIGNATURE;
+ }
}
fd = Fopen(filename, "r");
if (fd == NULL)