Merge branch 'master' of ssh://vps.jankratochvil.net/var/lib/git/nethome

diff --git a/bin/build b/bin/build
index c75eb56..c0747a5 100755 (executable)
--- a/bin/build
+++ b/bin/build
@@ -147,7 +147,7 @@ mkdir $HOME/redhat/glibc-build
  run make install
  )
 
-for d in f16 f15 f14 rawhide;do
+for d in f16 f15 rawhide;do
        hammock -c fedoragdb -i $I-fedoragdb-$d -d $d
 done
 ### hammock -c fedoragdb -d rawhide --cd f12! -i $I-fedoragdb-f12-on-rawhide
@@ -169,7 +169,7 @@ done
 #      archer-pmuldoon-next-over-throw2        \
 #      archer-jankratochvil-ifunc              \
 
-for d in f16 f15 f14 rawhide;do
+for d in f16 f15 rawhide;do
        hammock -c gdbcvs -i $I-gdbcvs-$d -d $d
 done
 

diff --git a/bin/hammock b/bin/hammock
index 8844203..2e6fd32 100755 (executable)
--- a/bin/hammock
+++ b/bin/hammock
@@ -258,7 +258,7 @@ for my $file (@file) {
   newdir "$dir/file.d","mayexist";
   (my $base=$file)=~s{^.*/}{};
   my $d="$dir/file.d/$base";
-  link $file,$d or die "link $file $d: $!";
+  link $file,$d or spawn "cp -p '$file' '$d'";
   newdir "$resultid/file.d","mayexist";
   link $d,"$resultid/file.d/$base" or warn "link $file $resultid/file.d/$base: $!";
 }

diff --git a/bin/mockrun b/bin/mockrun
index e2a8f3f..25a2694 100755 (executable)
--- a/bin/mockrun
+++ b/bin/mockrun
@@ -9,10 +9,11 @@ local $_=shift;
 delete @ENV{qw(PATH BASH_ENV)};
 tr{/}{}s;
 s{^/var/lib/mock/}{};
-my $safe="([-_a-z0-9]+)";
+my $safe="([-_a-z0-9/]+)";
 $_=(/$safe/)[0];
+my $HOME=($ENV{"HOME"}=~/$safe/)[0];
 my $rpath="/var/lib/mock/$_/root";
-system "sudo /usr/local/sbin/mocksetup -s $_" and die "sudo mocksetup $_";
+system "sudo $HOME/bin/mocksetup -s $_" and die "sudo mocksetup $_";
 -e "$rpath/MOCK" or die "mocksetup $_ and still no $rpath/MOCK";
 my $user=$ENV{"USER"};
 $user=($user=~/$safe/)[0];

diff --git a/bin/mocksetup b/bin/mocksetup
index 86170c0..e811d20 100755 (executable)
--- a/bin/mocksetup
+++ b/bin/mocksetup
@@ -70,7 +70,7 @@ for r in $l;do
   # mock -q -r $r chroot true echo "$rpath lock check"
 
   for n in passwd group;do
-    cat /etc/$n $rpath/etc/$n|perl -ne 'print if /^(?:[^:]*:){2}(5\d\d):/'|sort|uniq -u|tee -a $rpath/etc/$n
+    cat /etc/$n $rpath/etc/$n|perl -ne 'print if /^(?:[^:]*:){2}(10\d\d):/'|sort|uniq -u|tee -a $rpath/etc/$n
   done
   if [ ! -f $rpath/etc/mtab-orig ];then
     c="mv -f $rpath/etc/mtab $rpath/etc/mtab-orig"