Ignore:
Timestamp:
Aug 30, 2017, 5:08:03 PM (2 years ago)
Author:
bruno
Message:

YAML support working for most distros

  • Fix rebase issues
  • Adds a pbsyncheck script for pre-commit check
  • Fix test deps for centos & fedora
  • update pbcl versions for deb build
File:
1 edited

Legend:

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

    r2261 r2279  
    2626# Inherit from the "Exporter" module which handles exporting functions.
    2727 
    28 use vars qw($VERSION $REVISION @ISA @EXPORT);
     28use vars qw($VERSION $REVISION $PBCONFVER @ISA @EXPORT);
    2929use Exporter;
    3030 
     
    3434our @ISA = qw(Exporter);
    3535our @EXPORT = qw(pb_distro_init pb_distro_conffile pb_distro_sysconffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_setuprepo_gen pb_distro_get_param pb_distro_get_context pb_distro_to_keylist pb_distro_conf_print pb_apply_conf_proxy);
    36 ($VERSION,$REVISION) = pb_version_init();
     36($VERSION,$REVISION,$PBCONFVER) = pb_version_init();
    3737
    3838=pod
     
    7777sub pb_distro_conffile {
    7878
    79 return("CCCC/pb.conf");
     79if ($PBCONFVER < 1) {
     80    return("CCCC/pb.conf");
     81} else {
     82    return("CCCC/pb.yml");
     83}
    8084}
    8185
     
    8892sub pb_distro_sysconffile {
    8993
    90 return("SSSS/pb.conf");
     94if ($PBCONFVER < 1) {
     95    return("SSSS/pb.conf");
     96} else {
     97    return("SSSS/pb.yml");
     98}
    9199}
    92100
Note: See TracChangeset for help on using the changeset viewer.