فهرست منبع

avoid duplicates in dependency list, sort dependency list, push back requirement to OpenPKG1.0.0

Michael van Elst 23 سال پیش
والد
کامیت
aedd0d8e73
2فایلهای تغییر یافته به همراه4 افزوده شده و 7 حذف شده
  1. 2 5
      openpkg-tool/openpkg-build.pl
  2. 2 2
      openpkg-tool/openpkg-tool.spec

+ 2 - 5
openpkg-tool/openpkg-build.pl

@@ -1562,8 +1562,6 @@ sub build_deps ($$) {
                 : ( )
             } @list;
 
-    @out = @list;
-
     #
     # recurse over dependencies
     #
@@ -1573,6 +1571,7 @@ sub build_deps ($$) {
         next if $env->{builddeps}->{$_->{name}};
         $env->{builddeps}->{$_->{name}} = 1;
 
+        push @out, $_;
         $list = build_deps($_->{name}, $env);
         push @out, @$list;
     }
@@ -1849,9 +1848,7 @@ sub print_map ($$$$$) {
 sub print_deps ($) {
     my($list) = @_;
 
-    foreach (@$list) {
-        print vsn($_),"\n";
-    }
+    print join("\n", sort map { vsn($_) } @$list),"\n";
 }
 
 #######################################################################

+ 2 - 2
openpkg-tool/openpkg-tool.spec

@@ -46,8 +46,8 @@ Source5:      Makefile
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20021230
-PreReq:       OpenPKG, openpkg >= 20021230
+BuildPreReq:  OpenPKG, openpkg >= 1.0.0
+PreReq:       OpenPKG, openpkg >= 1.0.0
 AutoReq:      no
 AutoReqProv:  no