Changeset 1192 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Feb 16, 2011, 12:17:55 PM (13 years ago)

Author:

Bruno Cornec

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

File:

• devel/pb/bin/pb (modified) (10 diffs)

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} = "";
 }