X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=bin%2Fhammock;h=a25c20e4e625158761d95acb1895b64dc236e22d;hb=1abaaaead56081a741e7869ac76002bca7e9fe7a;hp=34de97bc6f43e5ac81b489c79f66579a54df0828;hpb=8777a95561301be07844b6323a6860a395eb7a9d;p=nethome.git

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