aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2017-11-01 01:33:06 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2017-11-06 20:54:07 +0100
commit00fa59a1c337d41194f50966cbb939a63811d157 (patch)
tree7d85fd8743f37fc1fb669eb4265f46b22cac0ebb
parente6aa740fd1cdddfcf6b2df6be7334f93366e1cce (diff)
downloadperl-URPM-00fa59a1c337d41194f50966cbb939a63811d157.tar
perl-URPM-00fa59a1c337d41194f50966cbb939a63811d157.tar.gz
perl-URPM-00fa59a1c337d41194f50966cbb939a63811d157.tar.bz2
perl-URPM-00fa59a1c337d41194f50966cbb939a63811d157.tar.xz
perl-URPM-00fa59a1c337d41194f50966cbb939a63811d157.zip
restore rpm-4.12.x compatibility
-rw-r--r--NEWS2
-rw-r--r--URPM.xs4
2 files changed, 6 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 0895e66..9634150 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
- make clear URPM needs rpm >= 4.14
+- restore compatibility with rpm-4.12.x & 4.13.x
- revert fix for segfault with rpm-4.14 when checking invalid signatures as rpm
got fixed
+- restore rpm-4.12.x compatibility
- restore rpm-4.13.x compatibility
- use ExtUtils::PkgConfig in order to get rpm installed
- cpan testers:
diff --git a/URPM.xs b/URPM.xs
index ef3254b..65729a5 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -1269,10 +1269,12 @@ static void *rpmRunTransactions_callback(__attribute__((unused)) const void *h,
callback = td->callback_error;
callback_type = "error";
break;
+#ifdef RPM4_13_0
case RPMCALLBACK_ELEM_PROGRESS:
callback = td->callback_elem;
callback_type = "elem";
break;
+#endif
default:
break;
}
@@ -1304,9 +1306,11 @@ static void *rpmRunTransactions_callback(__attribute__((unused)) const void *h,
case RPMCALLBACK_CPIO_ERROR:
callback_subtype = "cpio";
break;
+#ifdef RPM4_13_0
case RPMCALLBACK_ELEM_PROGRESS:
callback_subtype = "progress";
break;
+#endif
case RPMCALLBACK_SCRIPT_ERROR:
callback_subtype = "script";
break;