From e806a20cd96d7b91b32115d54e7df02466480eee Mon Sep 17 00:00:00 2001
From: jkratoch <>
Date: Tue, 8 Sep 2009 19:24:47 +0000
Subject: [PATCH] +--cd|--componentdistro Default -D|--distrojobs to 1 if
 --target is in use. Check duplicate --target items. Default -a for --target.
 Write ".../time" file to the toplevel output dir.

---
 bin/hammock | 82 +++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 56 insertions(+), 26 deletions(-)

diff --git a/bin/hammock b/bin/hammock
index 8f7a8b9..19ba50b 100755
--- a/bin/hammock
+++ b/bin/hammock
@@ -16,7 +16,6 @@ my $rhelcvsroot=q{:pserver:anonymous:@192.168.67.2:3401/cvs/dist};
 my $arch_i386=qr{(?:x86|i\d86|ia32)}io;
 my $arch_x86_64=qr{(?:x8664|x86_64|em64t)}io;
 my @arches=qw(i386 x86_64);
-my $arches_re=qr{(?:i386|x86_64)};
 
 my $error=0;
 sub error
@@ -29,6 +28,7 @@ my $userid;
 my $force;
 my $parallel=9;	# 1 or 2 or 3
 my @distro;
+my @componentdistro;
 my @path;
 my @arch;
 my $component;
@@ -36,7 +36,7 @@ my $srcrpm;
 my @file;
 my @target;
 # FIXME: Connect make paralellization to the children.
-my $distrojobs=2;
+my $distrojobs;
 die if !GetOptions(
   "i|userid=s"=>\$userid,
     "force"=>\$force,
@@ -44,6 +44,7 @@ die if !GetOptions(
   "2|standard"=>sub { $parallel=2; },
   "3|parallel"=>sub { $parallel=3; },
   "d|distro=s{,}"=>\@distro,
+    "cd|componentdistro=s{,}"=>\@componentdistro,
   "p|path=s{,}"=>\@path,
   "a|arch=s{,}"=>\@arch,
   "c|component=s"=>\$component,
@@ -58,9 +59,13 @@ $component and $srcrpm and die "-c|--component excludes -s|--srcrpm";
 $component or $srcrpm or die "-c|--component or -s|--srcrpm required";
 $component||="";  # Make `eq' not complaining.
 @target and ($srcrpm or $component=~/^(?:fedora|rhel)/) and die "--target is available only for baretestsuite modes";
+my %target;
+do { error "Duplicate target: $_\n" if $target{$_}++; } for @target;
+@arch="x86_64" if @target&&!@arch;
 for my $file (@file) {
   -f $file and -r $file or error "-f|--file $file not readable: $!";
 }
+$distrojobs=(@target?1:2) if !defined $distrojobs;
 $distrojobs=~/^\d+$/ or die "-D|distrojobs must be a number: $distrojobs";
 $distrojobs>=1 or die "-D|distrojobs must be positive: $distrojobs";
 # User may want to modify ASAP her files submitted for the test.
@@ -69,10 +74,12 @@ $parallel||=$will_copy ? 2 : 1;
 error "Excessive arguments: @ARGV" if @ARGV;
 @arch=@arches if !@arch;
 my $path=join(":",@path) if @path;
+@componentdistro and @componentdistro!=@distro and die "--cd|--componentdistro must have the same elements count as -d|--distro";
+
+sub distro_normalize($)
+{
+  local $_=$_[0];
 
-# epel-\d-i386|fedora-\d-i386|fedora-rawhide-i386
-my @distrouse;
-for (@distro) {
   s{^/var/lib/mock/+}{};
   s{/+$}{};
   s/^.*$/\L$&/s;
@@ -82,13 +89,31 @@ for (@distro) {
   my @archuse;
   @archuse="i386" if s/-$arch_i386$//o;
   @archuse="x86_64" if s/-$arch_x86_64$//o;
+
+  for my $arch (@archuse?@archuse:@arch) {
+    my $dir="/var/lib/mock/$_-$arch";
+    -d $dir or error "No distro: $dir";
+  }
+
+  return ($_,@archuse);
+}
+
+# epel-\d-i386|fedora-\d-i386|fedora-rawhide-i386
+my @distrouse;
+for my $distroi (0..$#distro) {
+  my $distro=$distro[$distroi];
+  my $componentdistro=$componentdistro[$distroi];
+  my @archuse;
+  if ($componentdistro) {
+    ($componentdistro,@archuse)=distro_normalize $componentdistro;
+    @archuse and die "--cd|--componentdistro must have no arch: ".join(" ",@archuse);
+  }
+  ($distro,@archuse)=distro_normalize $distro;
+  $componentdistro||=$distro;
   @archuse=@arch if !@archuse;
   for my $archuse (@archuse) {
-    my $basename="$_-$archuse";
-    my $dir="/var/lib/mock/$basename";
-    -d $dir or error "No distro: $dir";
-    for my $target (@target ? @target : undef()) {
-      push @distrouse,{"distro"=>$basename,"target"=>$target};
+    for my $target (@target?@target:undef()) {
+      push @distrouse,{"distro"=>"$distro-$archuse","componentdistro"=>$componentdistro,"target"=>$target};
     }
   }
 }
@@ -131,6 +156,16 @@ print STDERR "ID = $id | dir = $dir\n";
 error "No distros specified" if !@distrouse;
 die "$error errors seen, aborted" if $error;
 
+sub writefile
+{
+  my($fname,$content)=@_;
+
+  local *F;
+  open F,">$fname" or die $fname;
+  print F $content or die $fname;
+  close F or die $fname;
+}
+
 spawn "renice 20 -p $$";
 newdir $dir;
 $log="$dir/log";
@@ -142,12 +177,7 @@ my %dump=(
   "file"=>join("\n",@file),
 );
 while (my($name,$val)=each(%dump)) {
-  next if !$val;
-  local *F;
-  my $fname="$dir/$name";
-  open F,">$fname" or die $fname;
-  print F "$val\n" or die $fname;
-  close F or die $fname;
+  writefile "$dir/$name","$val\n" if $val;
 }
 
 sub subst
@@ -163,9 +193,7 @@ sub subst
 
   &{$sub}() or die $_."\nError substituting $in";
 
-  open F,">$out" or die $out;
-  print F $_ or die $out;
-  close F or die $out;
+  writefile $out,$_;
 }
 
 # PID->distro
@@ -174,6 +202,7 @@ while (@distrouse || keys(%child)) {
   while (keys(%child)<$distrojobs && @distrouse) {
     my $distrouse=shift @distrouse;
     my $distro=$distrouse->{"distro"};
+    my $componentdistro=$distrouse->{"componentdistro"};
     my $target=$distrouse->{"target"};
     my $rpmbuild="rpmbuild";
 
@@ -182,15 +211,15 @@ while (@distrouse || keys(%child)) {
     my $cvsrepo;
     if ($component=~/^fedora(.*)$/) {
       $cvsrepo=$1;
-      $cvsbasedir="F-$1" if $distro=~/^fedora-(\d+)-$arches_re$/;
-      $cvsbasedir="devel" if $distro=~/^fedora-rawhide-$arches_re$/;
-      die "$component vs. $distro" if !$cvsbasedir;
+      $cvsbasedir="F-$1" if $componentdistro=~/^fedora-(\d+)$/;
+      $cvsbasedir="devel" if $componentdistro=~/^fedora-rawhide$/;
+      die "$component vs. $componentdistro" if !$cvsbasedir;
       $cvsroot=$fedoracvsroot;
     }
     if ($component=~/^rhel(.*)$/) {
       $cvsrepo=$1;
-      $cvsbasedir="RHEL-$1" if $distro=~/^epel-(\d+)-$arches_re$/;
-      die "$component vs. $distro" if !$cvsbasedir;
+      $cvsbasedir="RHEL-$1" if $componentdistro=~/^epel-(\d+)$/;
+      die "$component vs. $componentdistro" if !$cvsbasedir;
       $cvsroot=$rhelcvsroot;
       # EPEL still uses Berkeley DB version 8 while F-11+ (F-10?) uses version 9.
       # Using db_dump and db_load would no longer make it mock compatible.
@@ -387,7 +416,8 @@ sub timestr($)
 }
 
 print STDERR "ID = $id | dir = $dir\n";
-print STDERR "total time=".timestr(time()-$start)."\n";
+my $time=timestr(time()-$start);
+print STDERR "total time=$time\n";
+writefile "$dir/time","$time\n";
 die "$error errors seen, aborted" if $error;
-
 print STDERR "done\n";
-- 
1.8.3.1