Changeset 1181 in ProjectBuilder for devel/pb-modules

Timestamp:

Feb 12, 2011, 1:56:42 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Fix rpmbootstrap and pb newve order, which wasn't working after the latest pbos introduction
• rpmbootstrap wasn't using the right conf file when launched with sudo is fixed by using the SUDO_USER env. var.
• pb.conf rbsmirrorsrv now uses pbos var, and is filtered correctly.

Location:

devel/pb-modules

Files:

• etc/pb.conf (modified) (2 diffs)
• lib/ProjectBuilder/Distribution.pm (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -322 +322 @@
 # URL of the directory containing the packages mentioned in rbsmindep. 
 # You can use some rpmbootstrap variables here:
-# $ddir: name of the distribution
-# $dver: version of the distribution
-# $darch: architecture of the distribution
+# $pbos->{'name'}: name of the distribution
+# $pbos->{'version'}: version of the distribution
+# $pbos->{'arch'}: architecture of the distribution
 # You need an http based mirror for the moment
-#rbsmirrorsrv fedora = http://download.fedora.redhat.com/pub/fedora/linux/releases/$dver/Everything/$darch/os/Packages/
-rbsmirrorsrv fedora = http://mirrors.kernel.org/fedora/releases/$dver/Fedora/$darch/os/Packages
-rbsmirrorsrv centos-4 = http://mirrors.kernel.org/centos/4.8/os/$darch/CentOS/RPMS
-rbsmirrorsrv centos-5 = http://mirrors.kernel.org/centos/5.5/os/$darch/CentOS
+#rbsmirrorsrv fedora = http://download.fedora.redhat.com/pub/fedora/linux/releases/$pbos->{'version'}/Everything/$pbos->{'arch'}/os/Packages/
+rbsmirrorsrv fedora = http://mirrors.kernel.org/fedora/releases/$pbos->{'version'}/Fedora/$pbos->{'arch'}/os/Packages
+rbsmirrorsrv centos-4 = http://mirrors.kernel.org/centos/4.8/os/$pbos->{'arch'}/CentOS/RPMS
+rbsmirrorsrv centos-5 = http://mirrors.kernel.org/centos/5.5/os/$pbos->{'arch'}/CentOS
 rbsmirrorsrv centos-5-ia64 = http://dev.centos.org/~z00dax/ia64/c5-wip/ia64/RPMS/
 #rbsmirrorsrv rhel =
-# darch == i586 for i386 repo
-rbsmirrorsrv opensuse = http://mirrors.kernel.org/opensuse/distribution/$dver/repo/oss/suse/$darch/
-# darch == i586 for i386 repo
-rbsmirrorsrv mandriva = http://mirrors.kernel.org/mandriva/Mandrakelinux/official/$dver/$darch/media/main/release/
+# pbos->{'arch'} == i586 for i386 repo
+rbsmirrorsrv opensuse = http://mirrors.kernel.org/opensuse/distribution/$pbos->{'version'}/repo/oss/suse/$pbos->{'arch'}/
+# pbos->{'arch'} == i586 for i386 repo
+rbsmirrorsrv mandriva = http://mirrors.kernel.org/mandriva/Mandrakelinux/official/$pbos->{'version'}/$pbos->{'arch'}/media/main/release/
 #rbsmirrorsrv debian = http://ftp.us.debian.org/debian/
 #rbsmirrorsrv ubuntu = http://us.releases.ubuntu.com/releases/
@@ -470 +470 @@
 ospkg default = project-builder
 # Where is the associated repo
-osrepo rpm = ftp://ftp.project-builder.org/$ddir/$dver/pb.repo
+osrepo rpm = ftp://ftp.project-builder.org/$pbos->{'name'}/$pbos->{'version'}/pb.repo
 
 # Number of process in // for pb

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

@@ -541 +541 @@
     if ($param =~ /[^\\]\$/) {
         pb_log(3,"Expanding variable on $param\n");
-        eval { $param =~ s/(\$\w+)/$1/eeg };
+        eval { $param =~ s/(\$\w+->{\'\w+\'})/$1/eeg };
     }
     push @param,$param;