Mageia Bugzilla – Attachment 11582 Details for
Bug 26471
urpmi does not handle nodejs requires dependency logic
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
patch to file nodejs depends
perl-URPM.diff (text/plain), 2.77 KB, created by
Joseph Wang
on 2020-04-12 00:15:43 CEST
(
hide
)
Description:
patch to file nodejs depends
Filename:
MIME Type:
Creator:
Joseph Wang
Created:
2020-04-12 00:15:43 CEST
Size:
2.77 KB
patch
obsolete
>diff --git a/ChangeLog b/ChangeLog >old mode 100644 >new mode 100755 >diff --git a/MANIFEST b/MANIFEST >old mode 100644 >new mode 100755 >diff --git a/META.yml b/META.yml >old mode 100644 >new mode 100755 >diff --git a/NEWS b/NEWS >old mode 100644 >new mode 100755 >diff --git a/README b/README >old mode 100644 >new mode 100755 >diff --git a/URPM.pm b/URPM.pm >old mode 100644 >new mode 100755 >index aa2b5f0..7b5aa67 >--- a/URPM.pm >+++ b/URPM.pm >@@ -263,6 +263,15 @@ sub changelogs { > } 0 .. $#ti; > } > >+sub provides_overlap { >+ my ($pkg, $property) = @_; >+ $property =~ s/^\((.*)\)$/$1/; >+ foreach (split(/\s+with\s+/, $property)) { >+ return 0 if !$pkg->provides_overlap_XS($_); >+ } >+ return 1; >+} >+ > package URPM::Transaction; > our @ISA = qw(); # help perl_checker > >@@ -759,6 +768,12 @@ Just the provided package name. > > =item $package->provides_overlap($s) > >+Parse property while taking into account boolean expressions with >+expression "with". These are found in nodejs packages >+ >+=cut >+ >+ > =item $package->rate() > > =item $package->release() >diff --git a/URPM.xs b/URPM.xs >old mode 100644 >new mode 100755 >index 465ed14..6c40a4b >--- a/URPM.xs >+++ b/URPM.xs >@@ -1939,7 +1939,7 @@ Pkg_obsoletes_overlap(pkg, s) > URPM::Package pkg > char *s > ALIAS: >- provides_overlap = 1 >+ provides_overlap_XS = 1 > PREINIT: > struct cb_overlap_s os; > char *eon = NULL; >diff --git a/URPM/Build.pm b/URPM/Build.pm >old mode 100644 >new mode 100755 >diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm >old mode 100644 >new mode 100755 >index 55f5c64..d0477c5 >--- a/URPM/Resolve.pm >+++ b/URPM/Resolve.pm >@@ -58,7 +58,7 @@ Returns the property name (eg: "mageia-release" in above example) > > sub property2name { > my ($property) = @_; >- $property =~ /^([^\s\[]*)/ && $1; >+ $property =~ /^\(*([^\s\[]*)/ && $1; > } > > =item property2name_range($property) >diff --git a/URPM/Signature.pm b/URPM/Signature.pm >old mode 100644 >new mode 100755 >diff --git a/t/00prepare.t b/t/00prepare.t >old mode 100644 >new mode 100755 >diff --git a/t/01setter-getter.t b/t/01setter-getter.t >old mode 100644 >new mode 100755 >diff --git a/t/buggy_synthesis.cz b/t/buggy_synthesis.cz >old mode 100644 >new mode 100755 >diff --git a/t/empty_synthesis.cz b/t/empty_synthesis.cz >old mode 100644 >new mode 100755 >diff --git a/t/fatal.t b/t/fatal.t >old mode 100644 >new mode 100755 >diff --git a/t/parse.t b/t/parse.t >old mode 100644 >new mode 100755 >diff --git a/t/pod.t b/t/pod.t >old mode 100644 >new mode 100755 >diff --git a/t/rpmdb.t b/t/rpmdb.t >old mode 100644 >new mode 100755 >diff --git a/t/sort_graph.t b/t/sort_graph.t >old mode 100644 >new mode 100755 >diff --git a/t/synthesis.t b/t/synthesis.t >old mode 100644 >new mode 100755 >diff --git a/t/test-rpm.spec b/t/test-rpm.spec >old mode 100644 >new mode 100755 >diff --git a/typemap b/typemap >old mode 100644 >new mode 100755
diff --git a/ChangeLog b/ChangeLog old mode 100644 new mode 100755 diff --git a/MANIFEST b/MANIFEST old mode 100644 new mode 100755 diff --git a/META.yml b/META.yml old mode 100644 new mode 100755 diff --git a/NEWS b/NEWS old mode 100644 new mode 100755 diff --git a/README b/README old mode 100644 new mode 100755 diff --git a/URPM.pm b/URPM.pm old mode 100644 new mode 100755 index aa2b5f0..7b5aa67 --- a/URPM.pm +++ b/URPM.pm @@ -263,6 +263,15 @@ sub changelogs { } 0 .. $#ti; } +sub provides_overlap { + my ($pkg, $property) = @_; + $property =~ s/^\((.*)\)$/$1/; + foreach (split(/\s+with\s+/, $property)) { + return 0 if !$pkg->provides_overlap_XS($_); + } + return 1; +} + package URPM::Transaction; our @ISA = qw(); # help perl_checker @@ -759,6 +768,12 @@ Just the provided package name. =item $package->provides_overlap($s) +Parse property while taking into account boolean expressions with +expression "with". These are found in nodejs packages + +=cut + + =item $package->rate() =item $package->release() diff --git a/URPM.xs b/URPM.xs old mode 100644 new mode 100755 index 465ed14..6c40a4b --- a/URPM.xs +++ b/URPM.xs @@ -1939,7 +1939,7 @@ Pkg_obsoletes_overlap(pkg, s) URPM::Package pkg char *s ALIAS: - provides_overlap = 1 + provides_overlap_XS = 1 PREINIT: struct cb_overlap_s os; char *eon = NULL; diff --git a/URPM/Build.pm b/URPM/Build.pm old mode 100644 new mode 100755 diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm old mode 100644 new mode 100755 index 55f5c64..d0477c5 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -58,7 +58,7 @@ Returns the property name (eg: "mageia-release" in above example) sub property2name { my ($property) = @_; - $property =~ /^([^\s\[]*)/ && $1; + $property =~ /^\(*([^\s\[]*)/ && $1; } =item property2name_range($property) diff --git a/URPM/Signature.pm b/URPM/Signature.pm old mode 100644 new mode 100755 diff --git a/t/00prepare.t b/t/00prepare.t old mode 100644 new mode 100755 diff --git a/t/01setter-getter.t b/t/01setter-getter.t old mode 100644 new mode 100755 diff --git a/t/buggy_synthesis.cz b/t/buggy_synthesis.cz old mode 100644 new mode 100755 diff --git a/t/empty_synthesis.cz b/t/empty_synthesis.cz old mode 100644 new mode 100755 diff --git a/t/fatal.t b/t/fatal.t old mode 100644 new mode 100755 diff --git a/t/parse.t b/t/parse.t old mode 100644 new mode 100755 diff --git a/t/pod.t b/t/pod.t old mode 100644 new mode 100755 diff --git a/t/rpmdb.t b/t/rpmdb.t old mode 100644 new mode 100755 diff --git a/t/sort_graph.t b/t/sort_graph.t old mode 100644 new mode 100755 diff --git a/t/synthesis.t b/t/synthesis.t old mode 100644 new mode 100755 diff --git a/t/test-rpm.spec b/t/test-rpm.spec old mode 100644 new mode 100755 diff --git a/typemap b/typemap old mode 100644 new mode 100755
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 26471
: 11582 |
11583