Changeset 983 in ProjectBuilder

Timestamp:

Feb 20, 2010, 2:22:11 AM (14 years ago)

Author:

Bruno Cornec

Message:

• rpmbootstrap good up to package name identification
• fedora-12 package list updated

Location:

devel

Files:

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

devel/pb-modules/etc/pb.conf

@@ -246 +246 @@
 rbsmindep fedora-11 = MAKEDEV,ConsoleKit-libs,audit-libs,basesystem,bash,beecrypt,bzip2-libs,chkconfig,compat-db45,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,dirmngr,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,fedora-release,fedora-release-notes,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libcap,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libksba,liblzma,libselinux,libsepol,libstdc++,libusb,libvolume_id,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,upstart,util-linux-ng,vim-minimal,yum,yum-metadata-parser,zlib
 #
-rbsmindep fedora-12 = MAKEDEV,ConsoleKit-libs,audit-libs,basesystem,bash,beecrypt,bzip2-libs,chkconfig,compat-db45,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,dirmngr,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,fedora-release,fedora-release-notes,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libcap,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libksba,liblzma,libselinux,libsepol,libstdc++,libusb,libvolume_id,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,upstart,util-linux-ng,vim-minimal,yum,yum-metadata-parser,zlib
+rbsmindep fedora-12 = MAKEDEV,ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,dirmngr,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,fedora-release,fedora-release-notes,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libcap,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libksba,libselinux,libsepol,libstdc++,libusb,libxml2,linux-atm-libs,logrotate,lua,lzma-libs,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,upstart,util-linux-ng,vim-minimal,yum,yum-metadata-parser,zlib
 #
 rbsmindep centos-4 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,centos-release,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,elfutils-libelf,ethtool,expat,filesystem,findutils,gawk,gdbm,glib2,glibc,glibc-common,grep,info,initscripts,iproute,iputils,krb5-libs,libacl,libattr,libcap,libgcc,libidn,libselinux,libsepol,libstdc++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-sqlite,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib
@@ -383 +383 @@
 oscmdopt pb = rpmbuild,dpkg-buildpackage,rpm,dpkg,wget,sudo,apt-get,mv,gzip,ebuild,makepkg,pkgmk,pkgtrans,rm,rpmlint,lintian,chroot,schroot,cp,chown,debsign,qemu-img,qemu,kvm,rpmbootstrap,rinse,mock,debootstrap,mkdir,cat,ssh,scp,yum,bash,make,vi,ssh-keygen,svn,hg,cvs,git,svk,svn2cl,cvs2cl,urpmi
 oscmd rpmbootstrap = rpm,rpm2cpio,wget
-oscmdopt rpmbootstrap = 
+#oscmdopt rpmbootstrap = 

devel/rpmbootstrap/bin/rpmbootstrap

@@ -133 +133 @@
 my ($projectbuilderver,$projectbuilderrev) = pb_version_init();
 my $appname = "rpmbootstrap";
+$ENV{'PBPROJ'} = $appname;
 
 # Initialize the syntax string
@@ -241 +242 @@
     die "Unable to download packages from $mirror for $ddir-$dver-$darch";
 }
-pb_log(3,"Mirror $mirror gave answer: $response->dump(maxlength => 0)\n");
-
-# Just print packages names if asked so. 
-if ($opts{'p'}) {
-    pb_log(0,"Should process package list: $pkgs\n");
-    exit(0);
-}
+pb_log(3,"Mirror $mirror gave answer: ".Dumper($response->dump(maxlength => 0))."\n");
+
+# Manages architectures specificities
+my $parch = $darch;
+$parch = "i?86" if ($darch eq "i386");
+
+# 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
+    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";
+        } else {
+            pb_log(3,"not a package\n");
+        }
+    }
+}
+
 
 # For each package to process, get it, put it in the cache dir 
@@ -253 +272 @@
 # Just download if asked so. 
 
+my $warning = 0;
+my $lwpkg ="";
 foreach my $p (split(/,/,$pkgs)) {
-    pb_log(1,"Processing package $p ...\n") 
+    pb_log(1,"Processing package $p ...\n");
+    # Just print packages names if asked so. 
+    if ($opts{'p'}) {
+        if (defined $url{$p}) {
+            pb_log(0,"$url{$p}\n");
+        } else {
+            pb_log(0,"WARNING: unable to find URL for $p\n");
+            $warning++;
+            $lwpkg .= " $p";
+        }
+        next;
     }
+}
+
+if ($warning ge 1) {
+    pb_log(0,"$warning WARNINGS found.\nMaybe you should review your package list for $ddir-$dver-$darch\nand remove$lwpkg\n");
+}
+
+# We Just printed packages names so now end
+if ($opts{'p'}) {
+    exit(0);
+}