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

Timestamp:

May 9, 2012, 3:33:18 AM (12 years ago)

Author:

Bruno Cornec

Message:

• pb.conf: installing project-builder requires --force-yes since the keys don't get installed into the virtual environment. (Eric Anderson from d3145b5c2c63cf9cf00ffa818fa03a432a2e6e45)
• pb.conf.pod: Fix lots of typos (coma -> comma) Document new ftp_proxy and http_proxy options. Document the rbsmirrorsrv option (already supported, not documented) Document that sshlogin and sshport are now optional parameters; both have reasonable defaults (not in that patch, will come later) (Eric Anderson from d3145b5c2c63cf9cf00ffa818fa03a432a2e6e45)
• Conf.pm: Use confess so when failing to get a parameter we get a stack trace. (Eric Anderson from d3145b5c2c63cf9cf00ffa818fa03a432a2e6e45)
• Distribution.pm: Fix typo (Donwloading -> Downloading); Fix code so that you can try to setup a VE multiple times. Existing debian code would fail the second time since pb.conf would already exist. Unclear on correct semantics here; the rpm code just force overwrites the file, but the old debian code was trying not to. (Eric Anderson from d3145b5c2c63cf9cf00ffa818fa03a432a2e6e45)
• Distribution.pm: Adding the internal function pb_distro_compare_repo to avoid code duplication between apt and yum repos treatment (Bruno Cornec)

File:

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

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

@@ -15 +15 @@
 use File::Basename;
 use File::Copy;
+# requires perl 5.004 minimum in VM/VE
+use File::Compare;
 
 # Global vars
@@ -441 +443 @@
 }
 
+# Internal
+sub pb_distro_compare_repo {
+
+my $src = shift;
+my $dest = shift;
+
+if (-f $dest && -s $dest == 0) {
+    pb_log(1, "Overwriting empty file $dest");
+} elsif (-f $dest && compare("$src", $dest) == 0) {
+    pb_log(1, "Overwriting identical file $dest");
+} elsif (not -f $dest) {
+    pb_log(1, "Creating new $dest");
+} else {
+    pb_log(0, "ERROR: destination file $dest exists and is different than source $src\n");
+    return(0);
+}
+# TRUE
+return(1);
+}
+
 =item B<pb_distro_setuprepo_gen>
 
@@ -469 +491 @@
     # The repo file can be local or remote. download or copy at the right place
     if (($scheme eq "ftp") || ($scheme eq "http")) {
-        pb_system("wget -O $ENV{'PBTMP'}/$bn $i","Donwloading additional repository file $i");
+        pb_system("wget -O $ENV{'PBTMP'}/$bn $i","Downloading additional repository file $i");
     } else {
         copy($i,$ENV{'PBTMP'}/$bn);
@@ -484 +506 @@
         } elsif ($bn =~ /\.repo$/) {
             # Yum repo
+            my $dest = "/etc/yum.repos.d/$bn";
+            return if (pb_distro_compare_repo($ENV{'PBTMP'}/$bn,$dest));
             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/) {
@@ -490 +514 @@
             pb_system("chmod 755 $ENV{'PBTMP'}/$bn ; sudo $ENV{'PBTMP'}/$bn 2>&1 > /dev/null","Adding urpmi repository");
         } else {
-            pb_log(0,"Unable to deal with repository file $i on rpm distro ! Please report to dev team\n");
+            pb_log(0,"ERROR: Unable to deal with repository file $i on rpm distro ! Please report to dev team\n");
         }
     } elsif ($pbos->{'type'} eq "deb") {
-        if (($bn =~ /\.sources.list$/) && (not -f "/etc/apt/sources.list.d/$bn")) {
+        if ($bn =~ /\.sources.list$/) {
+            my $dest = "/etc/apt/sources.list.d/$bn";
+            return if (pb_distro_compare_repo($ENV{'PBTMP'}/$bn,$dest));
             pb_system("sudo mv $ENV{'PBTMP'}/$bn /etc/apt/sources.list.d","Adding apt repository");
             pb_system("sudo apt-get update","Updating apt repository");
         } else {
-            pb_log(0,"Unable to deal with repository file $i on deb distro ! Please report to dev team\n");
+            pb_log(0,"ERROR: Unable to deal with repository file $i on deb distro ! Please report to dev team\n");
         }
     } else {
-        pb_log(0,"Unable to deal with repository file $i on that distro ! Please report to dev team\n");
+        pb_log(0,"ERROR: Unable to deal with repository file $i on that distro ! Please report to dev team\n");
     }
 }