Changeset 1802 in ProjectBuilder for devel/rpmbootstrap

Timestamp:

Dec 23, 2013, 9:22:01 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Adds mageia 3 VE support
• Adds rbsmirrorupd feature
• No -s option for oppatchcmd by default now
• Start to improve rpmbootstrap for new Fedora mirror

File:

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

devel/rpmbootstrap/bin/rpmbootstrap

@@ -266 +266 @@
 my ($rbscachedir) = pb_conf_get_if("cachedir");
 my ($pkgs,$mirror) = pb_distro_get_param($pbos,pb_conf_get("rbsmindep","rbsmirrorsrv"));
+my ($updater) = pb_distro_get_param($pbos,pb_conf_get_if("rbsmirrorupd"));
 die "No packages defined for $pbos->{name}-$pbos->{version}-$pbos->{arch}" unless $pkgs =~ /\w/;
 
@@ -283 +284 @@
 
 die "No mirror defined for $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}" if ((not defined $mirror) || ($mirror =~ /^\t*$/));
-pb_log(0,"Downloading package list from $mirror ...\n");
-my $response = $ua->get($mirror);
-if (! $response->is_success) {
-    if ($mirror =~ /i386/) {
-        # Some distro have an i586 or i686 mirror dir instead for i386
-        warn "Unable to download package from $mirror for $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.".$response->status_line;
-        $mirror =~ s|/i386/|/i586/|;
-        $response = $ua->get($mirror);
-        if (! $response->is_success) {
-            die "Unable to download package from $mirror for $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}".$response->status_line;
-        }
-    }
-}
-pb_log(3,"Mirror $mirror gave answer: ".Dumper($response->dump(maxlength => 0))."\n");
-
-# Try to find where the repodata structure is for later usage
-my $repo = $mirror;
-my $found = 0;
-if ($pbos->{'install'} =~ /yum/) {
-    my $response1;
-    while ($found == 0) {
-        $response1 = $ua->get("$repo/repodata");
-        pb_log(2,"REPO analyzed: $repo\n");
-        if (! $response1->is_success) {
-            $repo = dirname($repo);
-
-            # There is a limit to the loop, when / is reached and nothing found
-            my ($scheme, $account, $host, $port, $path) = pb_get_uri($repo);
-            die "Unable to find the repodata structure of the mirror $mirror\nPlease check the URL or warn the dev team.\n" if (($path =~ /^[\/]+$/) || ($path =~ /^$/));
-        
-            # / not reached, so looping
-            next;
-        } else {
-            # repodata found $repo is correct
-            $found = 1;
-            pb_log(2,"REPO found: $repo\n");
-            last;
-        }
-    }
+my $resp;
+my @list_pkg;
+
+$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);
+    push(@list_pkg,split(/\n/,$resp->as_string()));
 }
 
@@ -327 +299 @@
 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
 my %url;
-foreach my $l (split(/\n/,$response->as_string())) {
-    # Find a href ref in first pos
-    if ($l =~ /<a href="([^<>]*)">([^<>]*)<\/a>/i) {
-        my $url = $1;
-        my $pkg = $1;
-        my $desc = $2;
-        pb_log(3,"Found desc URL $desc: ");
-        # find an rpm package ref name-ver-tag.arch.rpm
-        if ($pkg =~ /(.+)-([^-]+)-([^-]+)\.(noarch|$parch)\.rpm$/) {
-            pb_log(3,"package ($1 + $2 + $3 + $4)\n");
-            $url{$1} = "$mirror/$url";
+foreach my $l (@list_pkg) {
+    my ($url,$desc) = rbs_find_pkg($l,$parch,"pkg");
+    if (defined $url) {
+        $url{$url} = "$mirror/$desc";
+    } else {
+        pb_log(3,"not a package, maybe a dir containing packages\n");
+        my $response1 = $ua->get("$mirror/Packages");
+        # Check if we have a fedora 17/18 type of repo
+        if ($response1->is_success) {
+            foreach my $d (split(/\n/,$response1->as_string())) {
+                ($url,$desc) = rbs_find_pkg($d,$parch,"dir");
+                if (defined $url) {
+                    # Here we have the dir in which are packages
+                    my $response2 = $ua->get("$mirror/Packages/$desc");
+                    foreach my $p (split(/\n/,$response2->as_string())) {
+                        ($url,$desc) = rbs_find_pkg($d,$parch,"dir");
+                        if (defined $url) {
+                            $url{$p} = "$mirror/$desc";
+                        } else {
+                            pb_log(3,"not a package, and not a dir containing packages\n");
+                        }
+                    }
+                } else {
+                }
+            }
         } else {
-            pb_log(3,"not a package\n");
         }
     }
@@ -508 +494 @@
         pb_system("sed -i -e 's/^mirrorlist/#mirrorlist/' $i","","quiet");
         # rather use neutral separators here
-        pb_system("sed -i -e 's|^#baseurl.*\$|baseurl=$repo|' $i","","quiet");
+        pb_system("sed -i -e 's|^#baseurl.*\$|baseurl=$mirror|' $i","","quiet");
     }
     $minipkglist = "ldconfig yum passwd vim-minimal dhclient authconfig";
@@ -637 +623 @@
     unlink($_) if ($_ =~ /\.rpmnew$/);
 }
+
+# Function to store packages found on Web pages
+
+sub rbs_find_pkg {
+
+my $l = shift;
+my $parch = shift;
+my $type = shift;
+
+pb_log(2,"Entering rbs_find_pkg with l=$l and parch=$parch\n");
+# Find a href ref in first pos
+if ($l =~ /<a href="([^<>]*)">([^<>]*)<\/a>/i) {
+    my $pkg = $1;
+    my $desc = $2;
+    pb_log(3,"Found desc URL $desc: ");
+    # find an rpm package ref name-ver-tag.arch.rpm
+    if (($type eq "pkg") && ($pkg =~ /(.+)-([^-]+)-([^-]+)\.(noarch|$parch)\.rpm$/)) {
+        pb_log(3,"package ($1 + $2 + $3 + $4)\n");
+        my $url = $1;
+        pb_log(2,"Exiting rbs_find_pkg with url=$url and desc=$desc\n");
+        return($url,$desc);
+    } elsif (($type eq "dir") && ($pkg =~ /([0-z])\//)) {
+        my $url = $1;
+        pb_log(3,"dir ($1)\n");
+        return($url,$1);
+    } else {
+        pb_log(3,"not a package\n");
+    }
+}
+pb_log(2,"Exiting rbs_find_pkg with undef\n");
+return(undef,undef);
+}
+
+sub rbs_mirror_response {
+
+my $mirror = shift;
+
+pb_log(0,"Downloading package list from $mirror ...\n");
+my $response = $ua->get($mirror);
+if (! $response->is_success) {
+    if ($mirror =~ /i386/) {
+        # Some distro have an i586 or i686 mirror dir instead for i386
+        warn "Unable to download package from $mirror for $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.".$response->status_line;
+        $mirror =~ s|/i386/|/i586/|;
+        pb_log(0,"Downloading now package list from $mirror ...\n");
+        $response = $ua->get($mirror);
+        if (! $response->is_success) {
+            die "Unable to download package from $mirror for $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}".$response->status_line;
+        }
+    }
+}
+pb_log(3,"Mirror $mirror gave answer: ".Dumper($response->dump(maxlength => 0))."\n");
+
+# Try to find where the repodata structure is for later usage
+my $repo = $mirror;
+my $found = 0;
+if ($pbos->{'install'} =~ /yum/) {
+    my $response1;
+    while ($found == 0) {
+        $response1 = $ua->get("$repo/repodata");
+        pb_log(2,"REPO analyzed: $repo\n");
+        if (! $response1->is_success) {
+            $repo = dirname($repo);
+
+            # There is a limit to the loop, when / is reached and nothing found
+            my ($scheme, $account, $host, $port, $path) = pb_get_uri($repo);
+            die "Unable to find the repodata structure of the mirror $mirror\nPlease check the URL or warn the dev team.\n" if (($path =~ /^[\/]+$/) || ($path =~ /^$/));
+        
+            # / not reached, so looping
+            next;
+        } else {
+            # repodata found $repo is correct
+            $found = 1;
+            pb_log(2,"REPO found: $repo\n");
+            last;
+        }
+    }
+}
+return($response);
+}
+