aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--URPM.xs3
-rw-r--r--URPM/Resolve.pm2
-rw-r--r--perl-URPM.spec6
3 files changed, 8 insertions, 3 deletions
diff --git a/URPM.xs b/URPM.xs
index b2238ca..6890bf3 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -1632,9 +1632,10 @@ Pkg_set_rflags(pkg, ...)
STRLEN len;
char *s = SvPV(ST(i), len);
memcpy(new_rflags + total_len, s, len);
- new_rflags[total_len + len] = 0;
+ new_rflags[total_len + len] = '\t';
total_len += len + 1;
}
+ new_rflags[total_len - 1] = 0; /* but mark end-of-string correctly */
if (gimme == G_ARRAY && pkg->rflags != NULL) {
char *s = pkg->rflags;
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index e5aaa18..1fd1b4d 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -267,7 +267,7 @@ sub resolve_requested {
if (my ($name) =~ /^([^\s\[]*)/) {
foreach (keys %{$urpm->{provides}{$name} || {}}) {
my $p = $urpm->{depslist}[$_];
- $pkg->flag_selected and $state->{ask_unselect}{$p->id}{$pkg->id};
+ $pkg->flag_selected and $state->{ask_unselect}{$p->id}{$pkg->id} = undef;
}
}
}
diff --git a/perl-URPM.spec b/perl-URPM.spec
index e42f8a4..c5b025c 100644
--- a/perl-URPM.spec
+++ b/perl-URPM.spec
@@ -1,7 +1,7 @@
%define name perl-URPM
%define real_name URPM
%define version 0.08
-%define release 1mdk
+%define release 2mdk
%{expand:%%define rpm_version %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' rpm)}
@@ -48,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jul 8 2002 François Pons <fpons@mandrakesoft.com> 0.08-2mdk
+- fixed rflags setting (now keep more than one element).
+- fixed setting of ask_unselect correctly.
+
* Mon Jul 8 2002 François Pons <fpons@mandrakesoft.com> 0.08-1mdk
- added transaction flags (equivalence to --force and --ignoreSize).
- simplified some transaction method names.