From: jkratoch <>
Date: Sun, 6 Dec 2009 18:57:51 +0000 (+0000)
Subject: Support mock roots with --uniqueext (and thus no arch at its suffix).
X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=4b263c5830104cb97c249c234923ba6ca270fa8d;ds=sidebyside

Support mock roots with --uniqueext (and thus no arch at its suffix).
---

diff --git a/bin/hammock b/bin/hammock
index 34de97b..a25c20e 100755
--- a/bin/hammock
+++ b/bin/hammock
@@ -90,11 +90,12 @@ sub distro_normalize($;$)
   s/^(?:epel|rhel|centos)-?(\d)/epel-$1/;
   s/^(?:f|fedora)-?(\d)/fedora-$1/;
   my @archuse;
+  @archuse="" if -d "/var/lib/mock/$_";
   @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";
+    my $dir="/var/lib/mock/$_".(!$arch?"":"-$arch");
     $force or -d $dir or error "No distro: $dir";
   }
 
@@ -117,7 +118,7 @@ for my $distroi (0..$#distro) {
   @archuse=@arch if !@archuse;
   for my $archuse (@archuse) {
     for my $target (@target?@target:undef()) {
-      push @distrouse,{"distro"=>"$distro-$archuse","componentdistro"=>$componentdistro,"target"=>$target};
+      push @distrouse,{"distro"=>$distro.(!$archuse?"":"-$archuse"),"componentdistro"=>$componentdistro,"target"=>$target};
     }
   }
 }