aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--URPM.xs140
-rw-r--r--URPM/Build.pm2
-rw-r--r--perl-URPM.spec6
3 files changed, 88 insertions, 60 deletions
diff --git a/URPM.xs b/URPM.xs
index 4b049d2..15d7576 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -319,6 +319,73 @@ xreturn_files(register SV **sp, Header header, int filter_mode) {
return sp;
}
+static SV **
+xreturn_problems(register SV **sp, rpmps ps, int translate_message) {
+ if (ps && ps->probs && ps->numProblems > 0) {
+ int i;
+
+ for (i = 0; i < ps->numProblems; i++) {
+ rpmProblem p = ps->probs + i;
+
+ if (p->ignoreProblem)
+ continue;
+
+ if (translate_message) {
+ /* translate error using rpm localization */
+ const char *buf = rpmProblemString(ps->probs + i);
+ XPUSHs(sv_2mortal(newSVpv(buf, 0)));
+ _free(buf);
+ } else {
+ const char *pkgNEVR = p->pkgNEVR ? p->pkgNEVR : "";
+ const char *altNEVR = p->altNEVR ? p->altNEVR : "";
+ const char *s = p->str1 ? p->str1 : "";
+ SV *sv;
+
+ switch (p->type) {
+ case RPMPROB_BADARCH:
+ sv = newSVpvf("badarch@%s", pkgNEVR); break;
+
+ case RPMPROB_BADOS:
+ sv = newSVpvf("bados@%s", pkgNEVR); break;
+
+ case RPMPROB_PKG_INSTALLED:
+ sv = newSVpvf("installed@%s", pkgNEVR); break;
+
+ case RPMPROB_BADRELOCATE:
+ sv = newSVpvf("badrelocate@%s@%s", pkgNEVR, s); break;
+
+ case RPMPROB_NEW_FILE_CONFLICT:
+ case RPMPROB_FILE_CONFLICT:
+ sv = newSVpvf("conflicts@%s@%s@%s", pkgNEVR, altNEVR, s); break;
+
+ case RPMPROB_OLDPACKAGE:
+ sv = newSVpvf("installed@%s@%s", pkgNEVR, altNEVR); break;
+
+ case RPMPROB_DISKSPACE:
+ sv = newSVpvf("diskspace@%s@%s@%ld", pkgNEVR, s, p->ulong1); break;
+
+ case RPMPROB_DISKNODES:
+ sv = newSVpvf("disknodes@%s@%s@%ld", pkgNEVR, s, p->ulong1); break;
+
+ case RPMPROB_BADPRETRANS:
+ sv = newSVpvf("badpretrans@%s@%s@%s", pkgNEVR, s, strerror(p->ulong1)); break;
+
+ case RPMPROB_REQUIRES:
+ sv = newSVpvf("requires@%s@%s", pkgNEVR, altNEVR+2); break;
+
+ case RPMPROB_CONFLICT:
+ sv = newSVpvf("conflicts@%s@%s", pkgNEVR, altNEVR+2); break;
+
+ default:
+ sv = newSVpvf("unknown@%s", pkgNEVR); break;
+ }
+ XPUSHs(sv_2mortal(sv));
+ }
+ }
+ }
+ return sp;
+}
+
static char *
pack_list(Header header, int_32 tag_name, int_32 tag_flags, int_32 tag_version) {
char buff[65536];
@@ -2124,15 +2191,25 @@ Trans_remove(trans, name)
RETVAL
void
-Trans_check(trans)
+Trans_check(trans, ...)
URPM::Transaction trans
PREINIT:
I32 gimme = GIMME_V;
+ int translate_message = 0;
+ int i;
#ifndef RPM_42
rpmDependencyConflict conflicts;
int num_conflicts;
#endif
PPCODE:
+ for (i = 1; i < items-1; i+=2) {
+ STRLEN len;
+ char *s = SvPV(ST(i), len);
+
+ if (len == 17 && !memcmp(s, "translate_message", 17)) {
+ translate_message = SvIV(ST(i+1));
+ }
+ }
#ifdef RPM_42
if (rpmtsCheck(trans->ts)) {
#else
@@ -2150,8 +2227,8 @@ Trans_check(trans)
if (gimme == G_SCALAR) {
XPUSHs(sv_2mortal(newSViv(0)));
} else if (gimme == G_ARRAY) {
- XPUSHs(sv_2mortal(newSVpv("failed dependencies to be completed", 0)));
- /* TODO */
+ /* now translation is handled by rpmlib, but only for version 4.2 and above */
+ SP = xreturn_problems(SP, ps, 1);
}
} else if (gimme == G_SCALAR) {
XPUSHs(sv_2mortal(newSViv(1)));
@@ -2273,66 +2350,13 @@ Trans_run(trans, data, ...)
if (rpmtsRun(trans->ts, NULL, probFilter) > 0) {
rpmps ps = rpmtsProblems(trans->ts);
XPUSHs(sv_2mortal(newSViv(rpmpsNumProblems(ps))));
+ SP = xreturn_problems(SP, ps, translate_message);
ps = rpmpsFree(ps);
- /* problems here more detailed TODO */
}
rpmtsEmpty(trans->ts);
#else
if (rpmRunTransactions(trans->ts, rpmRunTransactions_callback, &td, NULL, &probs, transFlags, probFilter)) {
- EXTEND(SP, probs->numProblems);
- for (i = 0; i < probs->numProblems; i++) {
- if (translate_message) {
- /* translate error using rpm localization */
- const char *buf = rpmProblemString(probs->probs + i);
- PUSHs(sv_2mortal(newSVpv(buf, 0)));
- _free(buf);
- } else {
- const char *pkgNEVR = (probs->probs[i].pkgNEVR ? probs->probs[i].pkgNEVR : "");
- const char *altNEVR = probs->probs[i].altNEVR ? probs->probs[i].altNEVR : "";
- const char *s = probs->probs[i].str1 ? probs->probs[i].str1 : "";
- SV *sv;
-
- switch (probs->probs[i].type) {
- case RPMPROB_BADARCH:
- sv = newSVpvf("badarch@%s", pkgNEVR); break;
-
- case RPMPROB_BADOS:
- sv = newSVpvf("bados@%s", pkgNEVR); break;
-
- case RPMPROB_PKG_INSTALLED:
- sv = newSVpvf("installed@%s", pkgNEVR); break;
-
- case RPMPROB_BADRELOCATE:
- sv = newSVpvf("badrelocate@%s@%s", pkgNEVR, s); break;
-
- case RPMPROB_NEW_FILE_CONFLICT:
- case RPMPROB_FILE_CONFLICT:
- sv = newSVpvf("conflicts@%s@%s@%s", pkgNEVR, altNEVR, s); break;
-
- case RPMPROB_OLDPACKAGE:
- sv = newSVpvf("installed@%s@%s", pkgNEVR, altNEVR); break;
-
- case RPMPROB_DISKSPACE:
- sv = newSVpvf("diskspace@%s@%s@%ld", pkgNEVR, s, probs->probs[i].ulong1); break;
-
- case RPMPROB_DISKNODES:
- sv = newSVpvf("disknodes@%s@%s@%ld", pkgNEVR, s, probs->probs[i].ulong1); break;
-
- case RPMPROB_BADPRETRANS:
- sv = newSVpvf("badpretrans@%s@%s@%s", pkgNEVR, s, strerror(probs->probs[i].ulong1)); break;
-
- case RPMPROB_REQUIRES:
- sv = newSVpvf("requires@%s@%s@%s", pkgNEVR, altNEVR+2); break;
-
- case RPMPROB_CONFLICT:
- sv = newSVpvf("conflicts@%s@%s", pkgNEVR, altNEVR+2); break;
-
- default:
- sv = newSVpvf("unknown@%s", pkgNEVR); break;
- }
- PUSHs(sv_2mortal(sv));
- }
- }
+ SP = xreturn_problems(SP, probs, translate_message);
}
#endif
diff --git a/URPM/Build.pm b/URPM/Build.pm
index 3910d4a..18a02d6 100644
--- a/URPM/Build.pm
+++ b/URPM/Build.pm
@@ -45,7 +45,7 @@ sub parse_rpms_build_headers {
} else {
($id, undef) = $urpm->parse_rpm($_);
defined $id or die "bad rpm $_\n";
-
+
my $pkg = $urpm->{depslist}[$id];
$filename = $pkg->fullname;
diff --git a/perl-URPM.spec b/perl-URPM.spec
index 47a3a7f..1c55e3b 100644
--- a/perl-URPM.spec
+++ b/perl-URPM.spec
@@ -1,7 +1,7 @@
%define name perl-URPM
%define real_name URPM
%define version 0.83
-%define release 2mdk
+%define release 3mdk
%{expand:%%define rpm_version %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' rpm)}
@@ -51,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue May 13 2003 Pons François <fpons@mandrakesoft.com> 0.83-3mdk
+- fixed URPM::Transaction::check and URPM::Transaction::run
+ when returning error list.
+
* Mon May 12 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 0.83-2mdk
- rebuild for new perl requires/provides
- provide perl packages URPM::Resolve and URPM::Build since the
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-25 22:53:53 +0000