System.Data.SQLite
Check-in [12fe311a36]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Simplify the changes in the previous check-in.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 12fe311a3619fe59dee6630821361ce18240fac2
User & Date: mistachkin 2014-11-24 22:09:15
Context
2014-11-24
22:21
Fix issues in the master release archive verification tool regarding file names containing spaces. check-in: 06cb175d37 user: mistachkin tags: trunk
22:09
Simplify the changes in the previous check-in. check-in: 12fe311a36 user: mistachkin tags: trunk
22:03
Check for missing Fossil tool in the master release archive verification tool. check-in: 59d9761e66 user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Setup/verify.eagle.

    21     21     #
    22     22     exit 1
    23     23   }
    24     24   
    25     25   proc getSha1Hashes { varName } {
    26     26     variable fossil
    27     27   
    28         -  if {![file exists $fossil]} then {
    29         -    usage [appendArgs "tool \"" $fossil "\" is missing"]
    30         -  }
    31         -
    32     28     upvar 1 $varName hashes
    33     29   
    34     30     set data [exec -success Success -nocarriagereturns -- \
    35     31         $fossil artifact current]
    36     32   
    37     33     set result 0
    38     34     set lines [split $data \n]
................................................................................
    50     46   
    51     47     return $result
    52     48   }
    53     49   
    54     50   proc getSha1Sum { fileName } {
    55     51     variable fossil
    56     52   
    57         -  if {![file exists $fossil]} then {
    58         -    usage [appendArgs "tool \"" $fossil "\" is missing"]
    59         -  }
    60         -
    61     53     return [string range [exec -success Success -nocarriagereturns \
    62     54         -trimall -- $fossil sha1sum $fileName] 0 39]
    63     55   }
    64     56   
    65     57   set argc [llength $argv]
    66     58   
    67     59   if {$argc == 2} then {
................................................................................
   145    137     }
   146    138   
   147    139     if {![file isdirectory $extractDirectory]} then {
   148    140       usage [appendArgs \
   149    141           "extract directory \"" $extractDirectory "\" does not exist"]
   150    142     }
   151    143   
   152         -  if {[getSha1Hashes hashes] == 0} then {
   153         -    usage "no repository hashes are available"
          144  +  if {$withHashes} then {
          145  +    if {![file exists $fossil]} then {
          146  +      usage [appendArgs "tool \"" $fossil "\" is missing"]
          147  +    }
          148  +
          149  +    if {[getSha1Hashes hashes] == 0} then {
          150  +      usage "no repository hashes are available"
          151  +    }
   154    152     }
   155    153   
   156    154     set archiveFileNames [list]
   157    155   
   158    156     foreach extension [list exe rar zip] {
   159    157       eval lappend archiveFileNames [findFilesRecursive \
   160    158           [file join $directory [appendArgs *. $extension]]]