Changeset 2337 in ProjectBuilder for devel/pb-modules

Timestamp:

Nov 9, 2017, 8:54:07 PM (6 years ago)

Author:

Bruno Cornec

Message:

More alpine improvements (but still not done yet)

Location:

devel/pb-modules

Files:

• etc/pb.yml (modified) (2 diffs)
• lib/ProjectBuilder/Distribution.pm (modified) (1 diff)

devel/pb-modules/etc/pb.yml

@@ -685 +685 @@
   mandrake-10.2: rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,diffutils,perl-DateManip,perl-YAML
   md: rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,perl-File-BaseDir,perl-Date-Manip,diffutils,perl-YAML
-  apk: perl-date-manip,wget,patch,make,perl-file-basedir,perl-yaml,diffutils,alpine-sdk,bash
+  apk: perl-date-manip,wget,patch,make,perl-file-basedir,perl-yaml,diffutils,alpine-sdk,bash,tzdata,openssh-keygen
   lsb: 
   deb: wget,patch,dpkg-dev,make,debian-builder,dh-make,fakeroot,ntpdate,libfile-mimeinfo-perl,libmodule-build-perl,libdate-manip-perl,libmail-sendmail-perl,diffutils,libyaml-perl
@@ -703 +703 @@
   Date-Manip: 6.42
   Module-Build: 0.4203
-  File-MimeInfo: 0.21
+  File-MimeInfo: 0.28
   File-BaseDir: 0.03
   YAML: 1.23

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -527 +527 @@
     } elsif ($pbos->{'type'} eq "ebuild") {
     } elsif ($pbos->{'type'} eq "apk") {
-        pb_log(0,"Looking for $p");
-        my $res = system("apk info | grep -E '^$p\$'");
-        if ($res eq 0) {
-            pb_log(0, "... OK\n");
-            next;
-        }
+        my $res = pb_system("apk -e info $p","Looking for $p","mayfail");
+        next if ($res eq 0);
         pb_log(1, "INFO: missing dependency $p\n");
     } else {