Changeset 1815 in ProjectBuilder

Timestamp:

Jan 4, 2014, 10:11:54 AM (10 years ago)

Author:

Bruno Cornec

Message:

• rbs_mirror_response now also returns the repo found which could be different from the initial mirror in case of metadata dir for yum (Fedora 18 and upper)
• filesystem is now extracted first for systemd symlinks crazyness support
• vepath is now purged before being recreated to avoid badly created previous chroot to survive operations (like with symlinks issues !)

File:

• devel/rpmbootstrap/bin/rpmbootstrap (modified) (6 diffs)

devel/rpmbootstrap/bin/rpmbootstrap

@@ -259 +259 @@
 die pb_log(0,"No target-dir specified and no default vepath found in $ENV{'PBETC'}\n") if (not defined $vepath);
 
-pb_mkdir_p($vepath) if (! -d $vepath);
+# Cleanup first
+if ( -d $vepath) {
+    pb_rm_rf($vepath);
+}
+pb_mkdir_p($vepath);
 
 #
@@ -285 +289 @@
 die "No mirror defined for $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}" if ((not defined $mirror) || ($mirror =~ /^\t*$/));
 my $resp;
+my $repo;
 my @list_pkg;
 
-$resp = rbs_mirror_response($mirror);
+($repo,$resp) = rbs_mirror_response($mirror);
 @list_pkg = split(/\n/,$resp->as_string());
 
 # If an update source is availble add it after so that these pkgs update the main ones
 if (defined $updater) {
-    $resp = rbs_mirror_response($mirror.$updater);
+    my $void;
+    ($void,$resp) = rbs_mirror_response($mirror.$updater);
     push(@list_pkg,split(/\n/,$resp->as_string()));
 }
@@ -299 +305 @@
 my $parch = $pbos->{'arch'};
 $parch = "i[3456]86" if ($pbos->{'arch'} eq "i386");
-my $repowithletter = 0;
 
 # Get the list of packages and their URL in this hash
@@ -366 +371 @@
 my $lwpkg ="";
 my @installed_packages;
+
+# On systemd systems, the pkg needs to be first 
+# to have the correct links made first
+if ($pkgs =~ /,filesystem,/) {
+    $pkgs =~ s/,filesystem,/,/;
+    $pkgs = "filesystem,".$pkgs;
+}
 
 foreach my $p (split(/,/,$pkgs)) {
@@ -502 +514 @@
         pb_system("sed -i -e 's/^mirrorlist/#mirrorlist/' $i","","quiet");
         # rather use neutral separators here
-        pb_system("sed -i -e 's|^#baseurl.*\$|baseurl=$mirror|' $i","","quiet");
+        pb_system("sed -i -e 's|^#baseurl.*\$|baseurl=$repo|' $i","","quiet");
     }
     $minipkglist = "ldconfig yum passwd vim-minimal dhclient authconfig";
@@ -709 +721 @@
     }
 }
-return($response);
-}
-
+return($repo,$response);
+}
+