Changeset 186


Ignore:
Timestamp:
Oct 8, 2007, 1:15:48 PM (12 years ago)
Author:
bruno
Message:

Fixes for SuSE/OpenSuSE coming from devel

Location:
0.7.10/pb
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • 0.7.10/pb/contrib/pbsetupqemu

    r181 r186  
    4949while (<PBFILE>) {
    5050    s/^pb:\!\!:/pb:*:/;
     51    s/^pb:\!:/pb:*:/;   #SLES 9 e.g.
    5152    print PBOUT $_;
    5253}
  • 0.7.10/pb/lib/ProjectBuilder/Distribution.pm

    r184 r186  
    3838} elsif (($ddir =~ /suse/) ||
    3939        ($ddir =~ /sles/)) {
     40    if ($ddir =~ /opensuse/) {
     41        $ddir = "suse";
     42    }
    4043    $dfam="novell";
    4144    $dtype="rpm";
     
    148151my %distro_similar = (
    149152    'mandrake'          => ['mandrake', 'mandrakelinux'],
    150     'suse'              => ['suse', 'sles'],
     153    'suse'              => ['suse', 'sles', 'opensuse'],
    151154    'redhat'            => ['redhat', 'rhel', 'centos', 'mandrake', 'vmware'],
    152155    'lsb'               => ['ubuntu', 'debian', 'lsb'],
     
    168171    'redhat'                => 'Red Hat Linux release (.+) \(',
    169172    'sles'                  => 'SUSE .* Enterprise Server (\d+) \(',
    170     'suse'                  => '(?:open|)SUSE(?: LINUX|) (\d.+)',
     173    'suse'                  => 'SUSE LINUX (\d.+)',
     174    'opensuse'              => 'openSUSE (\d.+) \(',
    171175    'lsb'                   => '.*[^Ubunt].*\nDISTRIB_RELEASE=(.+)',
    172176    'ubuntu'                => '.*Ubuntu.*\nDISTRIB_RELEASE=(.+)',
Note: See TracChangeset for help on using the changeset viewer.