Changeset 1031 in ProjectBuilder

Timestamp:

May 22, 2010, 8:40:29 PM (14 years ago)

Author:

Bruno Cornec

Message:

• the repodata dir is now search in the parents dir of the mirror given as it depends on yum version. CentOS 4 & 5, Fedora 12 OK.
• Update perl modules versions (Date-Manip is now in 6.x, still using 5.x at the moment)

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (3 diffs)
• rpmbootstrap/bin/rpmbootstrap (modified) (2 diffs)

devel/pb-modules/etc/pb.conf

@@ -287 +287 @@
 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.4/os/$darch/CentOS
+rbsmirrorsrv centos-5 = http://mirrors.kernel.org/centos/5.5/os/$darch/CentOS
 rbsmirrorsrv centos-5-ia64 = http://dev.centos.org/~z00dax/ia64/c5-wip/ia64/RPMS/
 #rbsmirrorsrv rhel =
@@ -303 +303 @@
 ospkgdep asianux = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
 # Fedora - Module-Build first for processing as needed by others
-osperldep fedora-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
-ospkgdep fedora-4 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
-osperldep fedora =
-ospkgdep fedora-5 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
-ospkgdep fedora-6 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
-ospkgdep fedora-7 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
-ospkgdep fedora-8 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
-ospkgdep fedora-9 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
-ospkgdep fedora-10 = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
-ospkgdep fedora = wget,make,fprintd-pam,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,perl-File-MimeInfo,perl-Mail-Sendmail,diffutils
+osperldep fedora = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
+ospkgdep fedora = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
 # fprintd-pam
 # Slack - Module-Build first for processing as needed by others
@@ -365 +357 @@
 # Version of the perl module as found on CPAN
 # http://search.cpan.org/CPAN/modules/by-module
-osperlver Date-Manip = 5.54
-osperlver Module-Build = 0.35
+osperlver Date-Manip = 5.56
+osperlver Module-Build = 0.3607
 osperlver File-MimeInfo = 0.15
 osperlver File-BaseDir = 0.03

devel/rpmbootstrap/bin/rpmbootstrap

@@ -261 +261 @@
 }
 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 ($pbupd =~ /yum/) {
+    my $response1;
+    while ($found == 0) {
+        $response1 = $ua->get("$repo/repodata");
+        if (! $response1->is_success) {
+            $repo = dirname($repo);
+
+            pb_log(2,"REPO analyzed: $repo\n");
+            # 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 =~ /^[\/]+$/);
+            
+            # / not reached, so looping
+            next;
+        } else {
+            # repodata found $repo is correct
+            $found = 1;
+            last;
+        }
+    }
+}
 
 # Manages architectures specificities
@@ -433 +458 @@
         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";