Changeset 2394


Ignore:
Timestamp:
Mar 19, 2019, 4:22:56 PM (5 weeks ago)
Author:
bruno
Message:

Do not consider os-release files when another was found earlier

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • 0.15.1/pb-modules/lib/ProjectBuilder/Distribution.pm

    r2391 r2394  
    277277    }
    278278}
    279 #
    280 # Now look at the os-release file to see if we have a std distribution description
    281 #
    282 foreach my $r ("/usr/lib/os-release","/etc/os-release") {
    283     if (-r $r) {
    284         my $tmp = pb_get_content("$r");
    285         ($release) = $tmp =~ m/.*\nVERSION_ID=[\"\']*([0-9a-z\._-]+)[\"\']*\n/m;
    286         ($distro) = $tmp =~ m/.*\nID=[\"\']*([0-9A-z\._-]+)[\"\']*\n/m;
    287         # Remove the leap suffix if present (OpenSUSE)
    288         $distro =~ s/-leap//;
    289         if ((defined $release) && (defined $distro)) {
    290             $found = 1;
    291             last;
     279if ($found == 0) {
     280    #
     281    # Now look at the os-release file to see if we have a std distribution description
     282    #
     283    foreach my $r ("/usr/lib/os-release","/etc/os-release") {
     284        if (-r $r) {
     285            my $tmp = pb_get_content("$r");
     286            ($release) = $tmp =~ m/.*\nVERSION_ID=[\"\']*([0-9a-z\._-]+)[\"\']*\n/m;
     287            ($distro) = $tmp =~ m/.*\nID=[\"\']*([0-9A-z\._-]+)[\"\']*\n/m;
     288            # Remove the leap suffix if present (OpenSUSE)
     289            $distro =~ s/-leap//;
     290            if ((defined $release) && (defined $distro)) {
     291                $found = 1;
     292                last;
     293            }
    292294        }
    293295    }
  • devel/pb-modules/lib/ProjectBuilder/Distribution.pm

    r2390 r2394  
    277277    }
    278278}
    279 #
    280 # Now look at the os-release file to see if we have a std distribution description
    281 #
    282 foreach my $r ("/usr/lib/os-release","/etc/os-release") {
    283     if (-r $r) {
    284         my $tmp = pb_get_content("$r");
    285         ($release) = $tmp =~ m/.*\nVERSION_ID=[\"\']*([0-9a-z\._-]+)[\"\']*\n/m;
    286         ($distro) = $tmp =~ m/.*\nID=[\"\']*([0-9A-z\._-]+)[\"\']*\n/m;
    287         # Remove the leap suffix if present (OpenSUSE)
    288         $distro =~ s/-leap//;
    289         if ((defined $release) && (defined $distro)) {
    290             $found = 1;
    291             last;
     279if ($found == 0) {
     280    #
     281    # Now look at the os-release file to see if we have a std distribution description
     282    #
     283    foreach my $r ("/usr/lib/os-release","/etc/os-release") {
     284        if (-r $r) {
     285            my $tmp = pb_get_content("$r");
     286            ($release) = $tmp =~ m/.*\nVERSION_ID=[\"\']*([0-9a-z\._-]+)[\"\']*\n/m;
     287            ($distro) = $tmp =~ m/.*\nID=[\"\']*([0-9A-z\._-]+)[\"\']*\n/m;
     288            # Remove the leap suffix if present (OpenSUSE)
     289            $distro =~ s/-leap//;
     290            if ((defined $release) && (defined $distro)) {
     291                $found = 1;
     292                last;
     293            }
    292294        }
    293295    }
  • devel/rpmbootstrap/etc/.pbrc.yml

    r2386 r2394  
    5555#velist default = centos-4-i386,centos-5-i386,centos-4-x86_64,centos-5-x86_64
    5656velist:
    57   default: centos-6-x86_64,centos-7-x86_64,debian-7-x86_64,debian-8-x86_64,debian-9-x86_64,ubuntu-14.04-x86_64,ubuntu-16.04-x86_64,ubuntu-17.10-x86_64,ubuntu-18.04-x86_64,ubuntu-18.10-x86_64,mageia-3-x86_64,mageia-4-x86_64,mageia-5-x86_64,mageia-6-x86_64,fedora-22-x86_64,fedora-23-x86_64,fedora-24-x86_64,fedora-25-x86_64,fedora-26-x86_64,fedora-27-x86_64,fedora-28-x86_64,fedora-29-x86_64,opensuse-42.1-x86_64,opensuse-42.2-x86_64,opensuse-42.3-x86_64,opensuse-13.2-x86_64,opensuse-15.0-x86_64,opensuse-15.1-x86_64,gentoo-nover-x86_64,alpine-nover-x86_64
     57  default: centos-6-x86_64,centos-7-x86_64,debian-7-x86_64,debian-8-x86_64,debian-9-x86_64,ubuntu-14.04-x86_64,ubuntu-16.04-x86_64,ubuntu-17.10-x86_64,ubuntu-18.04-x86_64,ubuntu-18.10-x86_64,mageia-5-x86_64,mageia-6-x86_64,fedora-22-x86_64,fedora-23-x86_64,fedora-24-x86_64,fedora-25-x86_64,fedora-26-x86_64,fedora-27-x86_64,fedora-28-x86_64,fedora-29-x86_64,opensuse-42.1-x86_64,opensuse-42.2-x86_64,opensuse-42.3-x86_64,opensuse-13.2-x86_64,opensuse-15.0-x86_64,opensuse-15.1-x86_64,gentoo-nover-x86_64,alpine-nover-x86_64
Note: See TracChangeset for help on using the changeset viewer.