Changeset 1594 in ProjectBuilder for devel/pb-modules

Timestamp:

May 24, 2012, 3:41:09 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug in VE context around the chown part (no quotes without the sudo)
• Improve mageia 2 deps
• pbtest is nearly at the end

Location:

devel/pb-modules

Files:

• etc/pb.conf (modified) (1 diff)
• lib/ProjectBuilder/Conf.pm (modified) (3 diffs)

devel/pb-modules/etc/pb.conf

@@ -376 +376 @@
 #
 rbsmindep mageia-1-i386 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,libacl1,libattr1,libblkid1,libbzip2_1,libcap2,libcurl4,libdb4.8,libelfutils1,libext2fs2,libgcc1,libgcrypt11,libgpg-error0,libidn11,libkrb53,libksba8,libldap2.4_2,liblua5.1,liblzma5,libmagic1,libncurses5,libnspr4,libnss3,libopenssl1.0.0,libpopt0,libreadline6,librpm1,libsasl2,libsqlite3_0,libssh2_1,libstdc++6,libtermcap2,libusb1.0_0,libuuid1,libxml2_2,libzlib1,logrotate,lua,mageia-release-common,meta-task,mingetty,module-init-tools,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,sysvinit-tools,udev,urpmi,util-linux-ng,vim-minimal
-rbsmindep mageia-1-x86_64 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,lib64acl1,lib64attr1,lib64blkid1,lib64bzip2_1,lib64cap2,lib64curl4,lib64db4.8,lib64elfutils1,lib64ext2fs2,lib64gcrypt11,lib64gpg-error0,lib64idn11,lib64krb53,lib64ksba8,lib64ldap2.4_2,lib64lua5.1,lib64lzma5,lib64magic1,lib64ncurses5,lib64nspr4,lib64nss3,lib64openssl1.0.0,lib64popt0,lib64readline6,lib64rpm1,lib64sasl2,lib64sqlite3_0,lib64ssh2_1,lib64termcap2,lib64usb1.0_0,lib64uuid1,lib64xml2_2,lib64zlib1,libgcc1,logrotate,lua,mageia-release-common,meta-task,mingetty,module-init-tools,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,sysvinit-tools,udev,urpmi,util-linux-ng,vim-minimal
-#
-rbsmindep mageia-2-i386 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,libacl1,libattr1,libblkid1,libbzip2_1,libcap2,libcurl4,libdb4.8,libelfutils1,libext2fs2,libgcc1,libgcrypt11,libgpg-error0,libidn11,libkrb53,libksba8,libldap2.4_2,liblua5.1,liblzma5,libmagic1,libncurses5,libnspr4,libnss3,libopenssl1.0.0,libpopt0,libreadline6,librpm1,libsasl2,libsqlite3_0,libssh2_1,libstdc++6,libtermcap2,libusb1.0_0,libuuid1,libxml2_2,libzlib1,logrotate,lua,mageia-release-common,meta-task,mingetty,module-init-tools,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,sysvinit-tools,udev,urpmi,util-linux-ng,vim-minimal
-rbsmindep mageia-2-x86_64 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,lib64acl1,lib64attr1,lib64blkid1,lib64bzip2_1,lib64cap2,lib64curl4,lib64db4.8,lib64elfutils1,lib64ext2fs2,lib64gcrypt11,lib64gpg-error0,lib64idn11,lib64krb53,lib64ksba8,lib64ldap2.4_2,lib64lua5.1,lib64lzma5,lib64magic1,lib64ncurses5,lib64nspr4,lib64nss3,lib64openssl1.0.0,lib64popt0,lib64readline6,lib64rpm1,lib64sasl2,lib64sqlite3_0,lib64ssh2_1,lib64termcap2,lib64usb1.0_0,lib64uuid1,lib64xml2_2,lib64zlib1,libgcc1,logrotate,lua,mageia-release-common,meta-task,mingetty,module-init-tools,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,sysvinit-tools,udev,urpmi,util-linux-ng,vim-minimal
+rbsmindep mageia-1-x86_64 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,lib64acl1,lib64attr1,lib64blkid1,lib64bzip2_1,lib64cap2,lib64curl4,lib64db4.8,lib64elfutils1,lib64ext2fs2,lib64gcrypt11,lib64gpg-error0,lib64idn11,lib64krb53,lib64ksba8,lib64ldap2.4_2,lib64lua5.1,lib64lzma5,lib64magic1,lib64ncurses5,lib64nspr4,lib64nss3,lib64openssl1.0.0,lib64popt0,lib64readline6,lib64rpm1,lib64sasl2,lib64sqlite3_0,lib64ssh2_1,lib64termcap2,lib64usb1.0_0,lib64uuid1,lib64xml2_2,lib64zlib1,libgcc1,logrotate,lua,mageia-release-common,meta-task,mingetty,module-init-tools,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,systemd,udev,urpmi,util-linux,vim-minimal
+#
+rbsmindep mageia-2-i386 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,libacl1,libattr1,libblkid1,libbzip2_1,libcap2,libcurl4,libdb4.8,libelfutils1,libext2fs2,libgcc1,libgcrypt11,libgpg-error0,libidn11,libkrb53,libksba8,libldap2.4_2,liblua5.1,liblzma5,libmagic1,libncurses5,libncursesw5,libnspr4,libnss3,libopenssl1.0.0,libpopt0,libreadline6,librpm2,librpmbuild2,libsasl2,libsqlite3_0,libssh2_1,libstdc++6,libtermcap2,libusb1.0_0,libuuid1,libxml2_2,libzlib1,logrotate,lua,mageia-release-common,meta-task,mingetty,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,sysvinit-tools,udev,urpmi,util-linux-ng,vim-minimal
+rbsmindep mageia-2-x86_64 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,lib64acl1,lib64attr1,lib64blkid1,lib64bzip2_1,lib64cap2,lib64curl4,lib64db4.8,lib64elfutils1,lib64ext2fs2,lib64gcrypt11,lib64gpg-error0,lib64idn11,lib64krb53,lib64ksba8,lib64ldap2.4_2,lib64lua5.1,lib64lzma5,lib64magic1,lib64ncurses5,lib64ncursesw5,lib64nspr4,lib64nss3,lib64openssl1.0.0,lib64popt0,lib64readline6,lib64rpm2,lib64rpmbuild2,lib64sasl2,lib64sqlite3_0,lib64ssh2_1,lib64termcap2,lib64usb1.0_0,lib64uuid1,lib64xml2_2,lib64zlib1,libgcc1,logrotate,lua,mageia-release-common,meta-task,mingetty,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,udev,urpmi,util-linux,systemd,vim-minimal
 
 # Where to store packages downloaded temporarily by rpmbootstrap

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

@@ -228 +228 @@
 =item B<pb_conf_get_in_hash_if>
 
-This function returns a table, corresponding to a set of values queried in the hash passe in parameter or undef if it doen't exist. It takes a table of keys as an input parameter.
+This function returns a table, corresponding to a set of values queried in the hash passed in parameter or undef if it doesn't exist. 
+It takes a table of keys as an input parameter.
 
 =cut
@@ -282 +283 @@
 sub pb_conf_get_if {
 
-my @params = @_;
-my @ptr = undef;
-
-return(pb_conf_get_in_hash_if($h,@params));
+return(pb_conf_get_in_hash_if($h,@_));
 }
 
@@ -346 +344 @@
             if (not defined $p1->{$ENV{'PBPROJ'}}) {
                 if (defined $p2->{$ENV{'PBPROJ'}}) {
-                    $p1->{$ENV{'PBPROJ'}} = $p2->{$ENV{'PBPROJ'}} if (defined $p2->{$ENV{'PBPROJ'}});
+                    $p1->{$ENV{'PBPROJ'}} = $p2->{$ENV{'PBPROJ'}};
                 } else {
                     $p1->{$ENV{'PBPROJ'}} = $p1->{'default'} if (defined $p1->{'default'});