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

Timestamp:

Mar 6, 2009, 6:09:05 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Adds support for pre and post scripts for VM/VE launched before and after the build to allow for local setup.
• Adds additional repo support for debian type as well.
• Fix a bug around architecture compatibility check.
• Transmit verbosity level
• Adds support for proxy environment variables at setup and build time
• Do not reinstall a repo which was already there (except for urpmi)

File:

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

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

@@ -514 +514 @@
     if ($dtype eq "rpm") {
         if ($bn =~ /\.rpm$/) {
-        pb_system("sudo rpm -Uvh $ENV{'PBTMP'}/$bn","Adding package to setup repostory");
-    } elsif ($bn =~ /\.repo$/) {
+            my $pn = $bn;
+            $pn =~ s/\.rpm//;
+            if (pb_system("rpm -q --quiet $pn","","quiet") != 0) {
+                pb_system("sudo rpm -Uvh $ENV{'PBTMP'}/$bn","Adding package to setup repository");
+            }
+        } elsif ($bn =~ /\.repo$/) {
             # Yum repo
-            pb_system("sudo mv $ENV{'PBTMP'}/$bn /etc/yum.repo.d","Adding yum repository");
+            pb_system("sudo mv $ENV{'PBTMP'}/$bn /etc/yum.repos.d","Adding yum repository") if (not -f "/etc/yum.repos.d/$bn");
         } elsif ($bn =~ /\.addmedia/) {
             # URPMI repo
+            # We should test that it's not already a urpmi repo
             pb_system("chmod 755 $ENV{'PBTMP'}/$bn ; sudo $ENV{'PBTMP'}/$bn 2>&1 > /dev/null","Adding urpmi repository");
         } else {
@@ -525 +530 @@
         }
     } elsif ($dtype eq "deb") {
-        if ($bn =~ /\.sources.list$/) {
+        if (($bn =~ /\.sources.list$/) && (not -f "/etc/apt/sources.list.d/$bn")) {
             pb_system("sudo mv $ENV{'PBTMP'}/$bn /etc/apt/sources.list.d","Adding apt repository");
             pb_system("sudo apt-get update","Updating apt repository");