Changeset 2241 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Distribution.pm

Timestamp:

Aug 2, 2017, 6:16:44 PM (7 years ago)

Author:

Bruno Cornec

Message:

revert last commit as this is not ready yet for integration in that tree !

File:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (6 diffs)

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

@@ -26 +26 @@
 # Inherit from the "Exporter" module which handles exporting functions.
  
-use vars qw($VERSION $REVISION $PBCONFVER @ISA @EXPORT);
+use vars qw($VERSION $REVISION @ISA @EXPORT);
 use Exporter;
  
@@ -34 +34 @@
 our @ISA = qw(Exporter);
 our @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);
-($VERSION,$REVISION,$PBCONFVER) = pb_version_init();
+($VERSION,$REVISION) = pb_version_init();
 
 =pod
@@ -77 +77 @@
 sub pb_distro_conffile {
 
-if ($PBCONFVER < 1) {
-    return("CCCC/pb.conf");
-} else {
-    return("CCCC/pb.yml");
-}
+return("CCCC/pb.conf");
 }
 
@@ -92 +88 @@
 sub pb_distro_sysconffile {
 
-if ($PBCONFVER < 1) {
-    return("SSSS/pb.conf");
-} else {
-    return("SSSS/pb.yml");
-}
+return("SSSS/pb.conf");
 }
 
@@ -107 +99 @@
 Mandriva, Open SuSE and Fedora have all the same "rpm" type of build system. Ubuntu and Debian have the same "deb" type of build system. 
 And "fc" is the extension generated for all Fedora packages (Version will be added by pb).
-All this information is stored in an external configuration file typically at /etc/pb/pb.yml
+All this information is stored in an external configuration file typically at /etc/pb/pb.conf
 
 When passing the distribution name and version as parameters, the B<pb_distro_init> function returns the parameter of that distribution instead of the underlying one.
@@ -643 +635 @@
             my $dirdest = "";
             my $reponame = "";
-            # TODO: could go in pb.yml in fact
+            # TODO: could go in pb.conf in fact
             if ($pbos->{install} =~ /\byum\b/) {
                 $reponame="yum";