Changeset 1192

Timestamp:

02/16/11 12:17:55 (2 years ago)

Author:

bruno

Message:

• Fix pb_get_filters to also support filter based on os name and os-ver-arch as well to be coherent, and also fix bugs in the tests made for filter exitence.
• Fix pb_changelog with test for correct pb hash values which were changed previously
• Revert back using no arch subdir for deb based repo
• Introduce new parameter oscmdpath to support external commands full path name easier (could also be very useful for MondoRescue?)
• Another set of fixes for sudo comands support: no parameter taken in account, replace localhost by ALL to avoid nightmares with VMs naming

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb-modules/etc/pb.conf.pod (modified) (1 diff)
• pb/bin/pb (modified) (10 diffs)
• pb/lib/ProjectBuilder/Changelog.pm (modified) (6 diffs)
• pb/lib/ProjectBuilder/Filter.pm (modified) (6 diffs)

devel/pb-modules/etc/pb.conf

@@ -463 +463 @@
 #
 
+# Some path for commands may defer from one system to another
+ospathcmd-halt default = /sbin/halt
+ospathcmd-halt solaris = /usr/sbin/halt
+
 # How do you want to install pb in your VM/VE (pkg or file)
 pbinstalltype default = pkg

devel/pb-modules/etc/pb.conf.pod

@@ -142 +142 @@
  Conffile: pb
  Example: osnover gentoo = true
+
+=item B<ospathcmd-*>
+
+ Nature: Optional
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch).
+ Value: Full path name of the command mentioned after the '-' for the relative OS
+ Conffile: pb
+ Example: ospathcmd-halt solaris = /usr/sbin/halt, ospathcmd-halt default = /sbin/halt
 
 =item B<osperldep>

devel/pb/bin/pb

@@ -872 +872 @@
         $pb->{'ver'} = $pbver;
         $pb->{'pkg'} = $pbpkg;
+        $pb->{'suf'} = $pbos->{'suffix'};
         $pb->{'realpkg'} = $pbpkg;
-        $pb->{'suf'} = $pbos->{'suffix'};
         $pb->{'date'} = $pbdate;
         $pb->{'defpkgdir'} = $defpkgdir;
@@ -923 +923 @@
 
                 # Get all filters to apply
-                my $ptr = pb_get_filters($pbpkg,$pbos);
+                $ptr = pb_get_filters($pbpkg,$pbos);
     
                 pb_log(2,"DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n");
@@ -1650 +1650 @@
         $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}";
     } elsif ($cmt eq "Packages") {
-        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}";
+        if (($pbos->{'type'} eq "rpm") || ($pbos->{'type'} eq "pkg") || ($pbos->{'type'} eq "hpux") || ($pbos->{'type'} eq "tgz")) {
+            # put packages under an arch subdir
+            $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}";
+        } elsif (($pbos->{'type'} eq "deb") || ($pbos->{'type'} eq "ebuild")) {
+            # No need for an arch subdir
+            $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}";
+        } else {
+            die "Please teach the dev team where to deliver ($pbos->{'type'} type of packages\n";
+        }
 
         my $repodir = $tdir;
@@ -1777 +1785 @@
 
 # Up two levels to deal with the dist dir cross versions
-cd ../..
+cd ..
 mkdir -p dists/$pbos->{'version'}/contrib/binary-$pbos->{'arch'} dists/$pbos->{'version'}/contrib/source
 
 # Prepare a script to create apt info file
+# Reuse twice after
 TMPD=`mktemp -d /tmp/pb.XXXXXXXXXX` || exit 1
 mkdir -p \$TMPD
@@ -1791 +1800 @@
 
 echo "Creating Packages metadata ($pbos->{'arch'})"
-dpkg-scanpackages -a$pbos->{'arch'} $pbos->{'version'}/$pbos->{'arch'} /dev/null | gzip -c9 > dists/$pbos->{'version'}/contrib/binary-$pbos->{'arch'}/Packages.gz
-dpkg-scanpackages -a$pbos->{'arch'} $pbos->{'version'}/$pbos->{'arch'} /dev/null | bzip2 -c9 > dists/$pbos->{'version'}/contrib/binary-$pbos->{'arch'}/Packages.bz2
-echo "Creating Contents metadata ($pbos->{'arch'})"
-apt-ftparchive contents $pbos->{'version'} | gzip -c9 > dists/$pbos->{'version'}/Contents-$pbos->{'arch'}.gz
+dpkg-scanpackages -a$pbos->{'arch'} $pbos->{'version'} /dev/null | gzip -c9 > dists/$pbos->{'version'}/contrib/binary-$pbos->{'arch'}/Packages.gz
+dpkg-scanpackages -a$pbos->{'arch'} $pbos->{'version'} /dev/null | bzip2 -c9 > dists/$pbos->{'version'}/contrib/binary-$pbos->{'arch'}/Packages.bz2
+echo "Creating Contents metadata"
+apt-ftparchive contents $pbos->{'version'} | gzip -c9 > dists/$pbos->{'version'}/Contents.gz
 echo "Creating Release metadata ($pbos->{'arch'})"
 cat \$TMPD/Release > dists/$pbos->{'version'}/contrib/binary-$pbos->{'arch'}/Release
 echo "Architecture: $pbos->{'arch'}" >> dists/$pbos->{'version'}/contrib/binary-$pbos->{'arch'}/Release
 echo "Creating Source metadata"
-dpkg-scansources $pbos->{'version'}/$pbos->{'arch'} /dev/null | gzip -c9 > dists/$pbos->{'version'}/contrib/source/Sources.gz
+dpkg-scansources $pbos->{'version'} /dev/null | gzip -c9 > dists/$pbos->{'version'}/contrib/source/Sources.gz
 cat \$TMPD/Release > dists/$pbos->{'version'}/contrib/source/Release
 echo "Architecture: Source" >> dists/$pbos->{'version'}/contrib/source/Release
@@ -1984 +1993 @@
         }
         my $hoption = "-p";
-        my $hpath = "/sbin";
-        # Solaris doesn't support -h and has halt elsewhere
+        my $hpath = pb_distro_get_param($pbos,pb_conf_get("oscmdpath-halt"));
+        # Solaris doesn't support -p and has halt elsewhere
         if ($pbos->{'type'} eq "pkg") {
             $hoption = "" ;
-            $hpath = "/usr/sbin";
         }
         pb_system("$shcmd \"sudo $hpath/halt $hoption \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
@@ -2957 +2965 @@
     # Try to restrict security to what is really needed
     if ($vtype =~ /^vm/) {
-        my $hpath = "/sbin";
-        # TODO: make that an external variable !
-        # Solaris has halt elsewhere
-        if ($pbos->{'type'} eq "pkg") {
-            $hpath = "/usr/sbin";
-        }
+        my $hpath = pb_distro_get_param($pbos,pb_conf_get("oscmdpath-halt"));
         my @sudocmds = pb_get_sudocmds($pbos,$ntpline,"$hpath/halt");
         print SCRIPT << "EOF";
@@ -2970 +2973 @@
 EOF
         foreach my $c (@sudocmds) {
-            print SCRIPT "print PBOUT \"$pbac->{$ENV{'PBPROJ'}}   localhost = NOPASSWD: $c\n\";";
+            print SCRIPT "print PBOUT \"$pbac->{$ENV{'PBPROJ'}}   ALL = NOPASSWD: $c\n\";";
         }
     } elsif ($vtype =~ /^rm/) {
@@ -2978 +2981 @@
 EOF
         foreach my $c (@sudocmds) {
-            print SCRIPT "print PBOUT \"$pbac->{$ENV{'PBPROJ'}}   localhost = NOPASSWD: $c\n\";";
+            print SCRIPT "print PBOUT \"$pbac->{$ENV{'PBPROJ'}}   ALL = NOPASSWD: $c\n\";";
         }
     } else {
@@ -3768 +3771 @@
 foreach my $c (split(/;/,$pbos->{'update'}),split(/;/,$pbos->{'install'}),@lines) {
     next if ($c !~ /^sudo/);
+    # remove sudo
     $c =~ s/^sudo\s+//;
+    # remove leading spaces
     $c =~ s/^\s+//;
+    # remove ending spaces
     $c =~ s/\s+$//;
+    # keep only the command, not the params
+    $c =~ s/([^\s]+)\s.*$/$1/;
     $sudocmds{$c} = "";
 }

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -61 +61 @@
 
 my $pb = shift;
-my $dtype = $pb->{'dtype'};
+
+my $dtype = $pb->{'pbos'}->{'type'};
 my $pbrealpkg = $pb->{'realpkg'};
 my $pbver = $pb->{'ver'};
 my $pbtag = $pb->{'tag'};
-my $pbsuf = $pb->{'suf'};
+my $pbsuf = $pb->{'pbos'}->{'suffix'};
 my $OUTPUT = shift;
 my $doit = shift;
@@ -72 +73 @@
 my $log = "";
 
+pb_log(2,"Entering pb_changelog - pb: ".Dumper($pb)."\n");
+pb_log(2,"Entering pb_changelog - doit: $doit\n") if (defined $doit);
+pb_log(2,"Entering pb_changelog - OUTPUT: $OUTPUT\n") if (defined $OUTPUT);
 # For date handling
 $ENV{LANG}="C";
@@ -82 +86 @@
         (not (defined $OUTPUT)) || ($OUTPUT eq "") ||
         (not (defined $doit)) || ($doit eq "")) {
-    print $OUTPUT "\n";
-    return;
-}
-
-if (((not defined $chglog) || (! -f $chglog)) && ($doit eq "yes")) {
-    #pb_log(2,"No ChangeLog file ($chglog) for $pbrealpkg\n";
+    pb_log(2,"Not enough input params\n");
     print $OUTPUT "\n";
     return;
@@ -106 +105 @@
 # If we don't need to do it, or don't have it fake something
 if (((not defined $chglog) || (! -f $chglog)) && ($doit ne "yes")) {
+    pb_log(2,"No ChangeLog file for $pbrealpkg - faking one\n");
     $date = strftime("%Y-%m-%d", @date);
     $ndate = &UnixDate($date,"%a", "%b", "%d", "%Y");
     $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
-    if (($dtype eq "rpm") || ($dtype eq "fc")) {
+    if ($dtype eq "rpm") {
         $ver2 = "$pbver-$pbtag";
         print $OUTPUT "* $ndate $pbpackager->{$ENV{'PBPROJ'}} $ver2\n";
         print $OUTPUT "- Updated to $pbver\n";
-        }
-    if ($dtype eq "deb") {
+    } elsif ($dtype eq "deb") {
         if ($pbver !~ /^[0-9]/) {
             # dpkg-deb doesn't accept non digit versions. 
@@ -123 +122 @@
         print $OUTPUT "  * Updated to $pbver\n";
         print $OUTPUT " -- $pbpackager->{$ENV{'PBPROJ'}}  $n2date\n\n\n";
-        }
+    } else {
+        pb_log(0,"No ChangeLog file for $pbrealpkg and no way faking one for type $dtype\n");
+    }
     return;
 }
@@ -208 +209 @@
 }
 close(INPUT);
+pb_log(2,"Exiting pb_changelog\n");
 }
 

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -62 +62 @@
 
 my @ffiles;
-my ($ffile00, $ffile0, $ffile1, $ffile2, $ffile3);
-my ($mfile00, $mfile0, $mfile1, $mfile2, $mfile3);
+my ($ffile00, $ffile0, $ffile1, $ffile2, $ffile3, $ffile4, $ffile5);
+my ($mfile00, $mfile0, $mfile1, $mfile2, $mfile3, $mfile4, $mfile5);
 my $pbpkg = shift || die "No package specified";
 my $pbos = shift;
@@ -69 +69 @@
 my %h;
 
+pb_log(2,"Entering pb_get_filters - pbpkg: $pbpkg - pbos: ".Dumper($pbos)."\n");
 # Global filter files first, then package specificities
 if (-d "$ENV{'PBROOTDIR'}/pbfilter") {
     $mfile00 = "$ENV{'PBROOTDIR'}/pbfilter/all.pbf" if (-f "$ENV{'PBROOTDIR'}/pbfilter/all.pbf");
     if (defined $pbos) {
-        $mfile0 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'type'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'type'}.pbf"));
-        $mfile1 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'family'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'family'}.pbf"));
-        $mfile2 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}.pbf"));
-        $mfile3 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}-$pbos->{'version'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}-$pbos->{'version'}.pbf"));
+        $mfile0 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'os'}.pbf" if ((defined $pbos->{'os'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'os'}.pbf"));
+        $mfile1 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'type'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'type'}.pbf"));
+        $mfile2 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'family'}.pbf" if ((defined $pbos->{'family'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'family'}.pbf"));
+        $mfile3 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}.pbf" if ((defined $pbos->{'name'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}.pbf"));
+        $mfile4 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}-$pbos->{'version'}.pbf" if ((defined $pbos->{'name'}) && (defined $pbos->{'version'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}-$pbos->{'version'}.pbf"));
+        $mfile5 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.pbf" if ((defined $pbos->{'name'}) && (defined $pbos->{'version'}) && (defined $pbos->{'arch'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.pbf"));
     }
 
@@ -84 +87 @@
     push @ffiles,$mfile2 if (defined $mfile2);
     push @ffiles,$mfile3 if (defined $mfile3);
+    push @ffiles,$mfile4 if (defined $mfile4);
+    push @ffiles,$mfile5 if (defined $mfile5);
 }
 
@@ -89 +94 @@
     $ffile00 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/all.pbf" if (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/all.pbf");
     if (defined $pbos) {
-        $ffile0 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'type'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'type'}.pbf"));
-        $ffile1 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'family'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'family'}.pbf"));
-        $ffile2 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}.pbf"));
-        $ffile3 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}-$pbos->{'version'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}-$pbos->{'version'}.pbf"));
+        $ffile0 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'os'}.pbf" if ((defined $pbos->{'os'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'os'}.pbf"));
+        $ffile1 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'type'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'type'}.pbf"));
+        $ffile2 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'family'}.pbf" if ((defined $pbos->{'family'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'family'}.pbf"));
+        $ffile3 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}.pbf" if ((defined $pbos->{'name'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}.pbf"));
+        $ffile4 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}-$pbos->{'version'}.pbf" if ((defined $pbos->{'name'}) && (defined $pbos->{'version'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}-$pbos->{'version'}.pbf"));
+        $ffile5 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.pbf" if ((defined $pbos->{'name'}) && (defined $pbos->{'version'}) && (defined $pbos->{'arch'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.pbf"));
     }
     push @ffiles,$ffile00 if (defined $ffile00);
@@ -99 +106 @@
     push @ffiles,$ffile2 if (defined $ffile2);
     push @ffiles,$ffile3 if (defined $ffile3);
+    push @ffiles,$ffile4 if (defined $ffile4);
+    push @ffiles,$ffile5 if (defined $ffile5);
 }
 if (@ffiles) {
@@ -104 +113 @@
 
     foreach my $f (@ffiles) {
+        pb_log(3,"DEBUG processing filter file $f\n");
         open(CONF,$f) || next;
         while(<CONF>)  {
             if (/^\s*([A-z0-9-_]+)\s+([[A-z0-9-_]+)\s*=\s*(.+)$/) {
+                pb_log(3,"DEBUG creating entry $1, key $2, value $3\n");
                 $h{$1}{$2}=$3;
             }
         }
         close(CONF);
-
-        $ptr = $h{"filter"};
-        pb_log(2,"DEBUG f:".Dumper($ptr)."\n");
-    }
-}
+    }
+    $ptr = $h{"filter"};
+}
+pb_log(2,"DEBUG f:".Dumper($ptr)."\n") if (defined $ptr);
 return($ptr);
 }