--- v.pl.v99996 91c77f3daba8ab012314e2c21d1f3fa7fc3e0e1de9b9ae1c6e6ebb3c3782a12a8b514dc6d3a5bc10b6bac02f5aab598ff1a353e9fb15e1c0f8424eeab3cb306a +++ v.pl 8e0f5688f0e5ebfc7ada0b12b268fabfcd5adde7aa6dfb3ee3ed8c75750937591b3d092460c55b32e7b40146ae4d647c8d50f9ef44039914a6c946d3e1849c33 @@ -10,7 +10,7 @@ use strict; -my $version = "99996 K "; +my $version = "99995 K "; my $tdir = get_homedir() . "/.gnupgtmp"; @@ -109,9 +109,8 @@ "-----------------------------------------"; print "$border\n"; print "WARNING: $seal is an INVALID seal for $patch!\n"; - my $msg = "Check that this user is in your WoT, and that this key " . - "has not expired.\nOtherwise remove the invalid seal from your " . - "SEALS directory."; + my $msg = "Check that this user is in your WoT.\n" . + "Otherwise remove the invalid seal from your SEALS directory."; print "$msg\n"; print "$border\n"; remove_tmpdir($tdir); @@ -173,7 +172,7 @@ $src_file->{a} eq $sf->{b} && $src_file->{a} ne "false") { push @tmp, $sf_name; - $desc{$k} = [@tmp]; + $desc{$k} = [@tmp]; } } } @@ -194,7 +193,7 @@ $src_file->{b} eq $sf->{a} && $src_file->{b} ne "false") { push @tmp, $sf_name; - $ante{$k} = [@tmp]; + $ante{$k} = [@tmp]; } } } @@ -328,12 +327,15 @@ if($file_hash ne "false") { my $fp = $press_dir . "/" . get_filepath($src_file_name); my $hashed = `sha512sum $fp`; - $hashed =~ /(.*) .*/; - my $hash = $1; - print " File: $fp\n" . - "expected: $file_hash\n" . - " actual: $hash\n" - and die if $hash != $hashed; + $hashed =~ /^(.*) .*$/; + my $pressed_hash = $1; + if($file_hash ne $pressed_hash) { + print " File: $fp\n" . + "Expected: $file_hash\n" . + " Actual: $pressed_hash\n"; + remove_tmpdir($tdir); + die "Pressed file hash did not match expected!\n"; + } } } } @@ -417,14 +419,17 @@ sub add_desc_src_files { my ($node) = @_; - my %desc = descendants($node->name()); - my @suc = $node->successors(); - foreach my $s (@suc) { - my $name = $s->name(); - my @edges = $node->edges_to($s); - foreach my $e (@edges) { - $e->set_attribute("title", "[ " . join('; ', sort @{$desc{$name}}) . " ]"); - add_desc_src_files($s); + if($node != "") { + my %desc = descendants($node->name()); + my @suc = $node->successors(); + foreach my $s (@suc) { + my $name = $s->name(); + my @edges = $node->edges_to($s); + foreach my $e (@edges) { + $e->set_attribute("title", "[ " . + join('; ', sort @{$desc{$name}}) . " ]"); + add_desc_src_files($s); + } } } } @@ -481,7 +486,8 @@ my @mirror_sigs = (); if(!-d $out) { `mkdir -p $out`; } my $wget = "wget -q -r -nd -N --no-parent " . - "--reject \"index.html*\" -A 'mirrors.*' http://thebitcoin.foundation/v/ -P $out"; + "--reject \"index.html*\" -A 'mirrors.*' " . + "http://thebitcoin.foundation/v/ -P $out"; `$wget`; my @sigs = `ls $out | sort`;