Changeset 2289 in ProjectBuilder

Timestamp:

Sep 4, 2017, 1:21:19 PM (7 years ago)

Author:

Bruno Cornec

Message:

Fix pb.conf old usage

• Fix build for pod doc
• Fix remaining ref to pb.conf

Location:

devel

Files:

• pb-doc/SECURITY (modified) (1 diff)
• pb-modules/Makefile.PL (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)

devel/pb-doc/SECURITY

@@ -9 +9 @@
 In the Distributions.pm module there are sudo calls, corresponding to the abilty to configure automatically additional repositories. That feature may not be used on RM or solved manually without problem. In case this is used, and sudo isn't configured accordingly, then the additional repo will NOT be added and the build will probably fail.
 
-In the default pb.conf main configuration files, parameters for osupd and osins for the various distributions call sudo to make the installation of missing packages. These calls are done as 'pb' user by default (or the account configured as rmlogin in the configuration file). In case this is used, and sudo isn't configured accordingly, then the additional required packages will NOT be added and the build will probably fail.
+In the default pb.yml main configuration files, parameters for osupd and osins for the various distributions call sudo to make the installation of missing packages. These calls are done as 'pb' user by default (or the account configured as rmlogin in the configuration file). In case this is used, and sudo isn't configured accordingly, then the additional required packages will NOT be added and the build will probably fail.
 For RM, we may consider that all required packages for the build are already installed on the system, or give rpm/yum/dnf/apt/urpmi/zypper... sudo rights to the build account manually.
 Recommended for a manual setup (not using rmsetup): Add manually to your system sudo access for the pb account to the local package install and update command such as /bin/rpm e.g:

devel/pb-modules/Makefile.PL

@@ -84 +84 @@
     # Produce the man page for pb.yml
     $text .= "\t".'mkdir -p $(DESTDIR)'."$mandir/man5\n";
-    $text .= "\t".'pod2man --section=5 etc/pb.conf.pod > $(DESTDIR)'."$mandir/man5/pb.conf.5\n";
+    $text .= "\t".'pod2man --section=5 etc/pb.yml.pod > $(DESTDIR)'."$mandir/man5/pb.yml.5\n";
     return($text);
 }

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

@@ -107 +107 @@
 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.conf
+All this information is stored in an external configuration file typically at /etc/pb/pb.yml
 
 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 +643 @@
             my $dirdest = "";
             my $reponame = "";
-            # TODO: could go in pb.conf in fact
+            # TODO: could go in pb.yml in fact
             if ($pbos->{install} =~ /\byum\b/) {
                 $reponame="yum";