Index: client/1.0/neutral/pkgr_upload.eagle ================================================================== --- client/1.0/neutral/pkgr_upload.eagle +++ client/1.0/neutral/pkgr_upload.eagle @@ -774,10 +774,40 @@ "could not change branch: " $error] } } } + # + # NOTE: This procedure attempts to stage the specified package file using + # Fossil. The fileName argument is the relative name of the file to + # be staged. This procedure may raise script errors. + # + proc stageOnePackageFile { fileName } { + variable checkoutDirectory + variable fossilAddCommand + + verifyCheckoutDirectory + + if {[isEagle]} then { + set fileName [::PackageRepository::formatExecArgument $fileName] + + if {[catch { + eval exec -success Success [subst $fossilAddCommand] + } error]} then { + error [appendArgs \ + "could not stage file \"" $fileName "\": " $error] + } + } else { + if {[catch { + eval exec [subst $fossilAddCommand] + } error]} then { + error [appendArgs \ + "could not stage file \"" $fileName "\": " $error] + } + } + } + # # NOTE: This procedure attempts to stage the specified package files using # Fossil. The fileNames argument is a list of (fully?) qualified # local file names to stage. # @@ -822,29 +852,12 @@ error [appendArgs \ "could not stage file \"" $fileName \ "\": OpenPGP signing failed"] } - set fileName $relativeFileName; # NOTE: For [subst]. - - if {[isEagle]} then { - set fileName [::PackageRepository::formatExecArgument $fileName] - - if {[catch { - eval exec -success Success [subst $fossilAddCommand] - } error]} then { - error [appendArgs \ - "could not stage file \"" $fileName "\": " $error] - } - } else { - if {[catch { - eval exec [subst $fossilAddCommand] - } error]} then { - error [appendArgs \ - "could not stage file \"" $fileName "\": " $error] - } - } + stageOnePackageFile $relativeFileName + stageOnePackageFile [appendArgs $relativeFileName .asc] } } # # NOTE: This procedure attempts to commit the staged package files to the @@ -1152,12 +1165,16 @@ if {!$batchMode} then { set title [appendArgs \ "Package Uploader Client: " [lindex [info level 0] 0]] - set message [appendArgs \ - "Package was submitted successfully: " $result] + if {[string length $result] > 0} then { + set message [appendArgs \ + "Package was submitted successfully: " $result] + } else { + set message "Package was submitted successfully." + } if {[isEagle]} then { catch { object invoke MessageBox Show $message $title } Index: client/1.0/neutral/pkgr_upload.eagle.asc ================================================================== --- client/1.0/neutral/pkgr_upload.eagle.asc +++ client/1.0/neutral/pkgr_upload.eagle.asc @@ -1,18 +1,18 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository -iQIcBAABCAAGBQJYXHe1AAoJEFAslq9JXcLZUbEP/iY+g9t1wrNP6ixOzSZvmWjc -z6o2axQnlNvVdNMRYXvqLqpp+rvZALc1lfJwZUA8aolv6wv3YnDPCcnkh2O0AOyt -Wg00oj3mk9r/nM7vriVCWciM4t3nY1LLK8dr8pJggyxvJPxen8ov6RP2DK+c+FNj -XY+Z/Y5rmVZnlkK0I4rHwP9+YW4d7zT605dAqHPxtEenjxvNHelONACOYnQRh9BR -iO4TcFnJLlJgqyjgNdnluiY0GFgIlOpKsve01TNQhHUPNJ5lzv2mywaX7FPAIjBr -4+42jRokaQUGYFw9zq6SocbJY4pPM7IoNAtjvaBH+rltA+jdiUWHjo2P+8GWuX25 -ftZsUsxfz5pD8dUr1tfG5rCd5fsVA2h01fO/obugmBmgZSZwmuRvAsg17cfmxinq -UWszBsrHth2bOauk6nBRG/DdA7rVf1cEFPywO2iwW9tx3tDR17X+dGBdHrgP+Hq1 -oihu42rs5+pwKw0jQnrirBjJrpUyJ+UnUJB/upcVZsRw6cxrMAdeQwEhlhj0Ekwz -cPOdoW2bvrJ1tMDZ0R1BNn8oUHPKf0mcQ+Sh+wJ7iSz21Y65JdcBx3yv2hkGEViB -EoVFE4E8pedzyXMLK3yPzPo8D1H9NVxXX/jRCrco9FLG/OHa2v+Wb3TyR9aGQgo2 -IR7mG7Zkh+zlkd42ACfU -=W/lR +iQIcBAABCAAGBQJYXIOKAAoJEFAslq9JXcLZqaMP+weMXgC4vuBl3VLXJt02KCPJ +NwTpu0ZeVf9sEcYspb//l6a1+bVx6Cjg4gyMUfntAe+lA2SDx+R0CsqFU3WADTb+ +N4qqNFX5WHRKId5r7Uoj6saTz3QDbi+Ah6UEWmLaXhp5Fnb6WfwON+SOirmrIKFY +y0ARGzYqAyi3RwhYmvBUGl8aVDKjPtC4kjeTlFrnOlpu6puLl1VnfcRq0wQ/8on1 +8InhawvN79ChmdN9EF3lpkZejpQ87WzMdkkVt2oNZHYC/dITioo8h1pKjI11LTVo +SdZYORsLBd+xKpILreLuwueuqkZainC+272Khmep6OFp5tEBJq40fu+RrqNygOLi +6Wsfk7PCPRS7zVsQQOAbthzw7ZuncB3qWWtQwjM5zw3dhxOCeDAl9SqsklXzXNJK +rMTF2KiCs8pDybd+YmR0ITrWH+1gO+qBiVzCi2Y7tqJuxoWJ03iWSCl5ye8t/6Xw +W/+AwWCWwsF1xk2L1/Fvwvqgtr1Vku4nYpeLiVzxhNpic7VvwPOZI9bGMSiTvRnU +SmgWW6UOrjSqZqArKsGsNMst0s1J+hvc7w5ikwJFTdsiopHLLZq4g/10ne1macG+ +3CvGYLwUl7vuUpzZYPvxQU+UItMU7rq2EnU3AiYM0mSMvR8q0q1Hxt5sO+6h8jl4 +DI4DB4FVwG+udy75tWUy +=4FNu -----END PGP SIGNATURE----- Index: client/1.0/neutral/pkgr_upload.eagle.harpy ================================================================== --- client/1.0/neutral/pkgr_upload.eagle.harpy +++ client/1.0/neutral/pkgr_upload.eagle.harpy @@ -19,50 +19,50 @@ None Mistachkin Systems - 61a3f6f8-30b5-487a-9a3f-93ff28cb5c6a + 4d5171dc-950f-4d14-aa67-348876d51f50 SHA512 Script - 2016-12-23T01:02:14.0878906Z + 2016-12-23T01:52:49.1289062Z -1.00:00:00 0x9559f6017247e3e2 - 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 Index: client/1.0/neutral/pkgr_upload.eagle.harpy.asc ================================================================== --- client/1.0/neutral/pkgr_upload.eagle.harpy.asc +++ client/1.0/neutral/pkgr_upload.eagle.harpy.asc @@ -1,18 +1,18 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository -iQIcBAABCAAGBQJYXHe3AAoJEFAslq9JXcLZFNQP/3b5fFoLkNtLhWlDzARUOfIt -mxaxh/XzKDzPIn1+LXPUy+N/o05Yhcc97WuAkwwsqr/1iELqBKg8+MddknPs7OR7 -JdEdMKY63lrRw/d5GUr1IMSIFi40a3oWER4Jgqtk0+gcy7NG7aqmQcOVfby05c9/ -T/hQH7h1aKVd6YjDv1QZ1NszIMS4WrBwwSLpN6pdNgE6sFXNlfP1B6H8IgbQN/1Z -ve8ri9cJuSIaXG/OHRnpVHM422JIkxUtkpGsUb6pvc3aeE36iFL7wSiUaKmuj5LL -Jcym0+8MyRaz6tLt+WHwAP0KRs7hl7luP1aAGP75twsQlx9uEfsbVoYw4+j619d6 -JhX7YX8C4F22V/ZQZOUoC7VebwAQ8Nx+QWwe8vzyAqZGXVAqRJ7Cl3oW4O6mzmjI -oaS5zXFQyLEU2n+sCUvTlCT9uvsIBV46cHiGEUOxs4iBpaOeXvorkoDEneJ8siZQ -f08J7qO0p3dOkj2e8wC/vfFZ+anw/1EU6bk8FdHc3l1Da0RSMmGcXG4/7NR2aI7F -16XYTriDG6gOn+cWEuZzPFYxp8aYX5NYtw4jfjLJKlIClqmBEBEMIaN673WKAoI8 -g1RC6GGWHjta5RO/CHzsnZgFubFyX1NgSdnZr50ZZbTNTMZbD+PqeEOwsHoBBfdd -d5Y5PVHIsuZmrdcf+nzo -=Dhu+ +iQIcBAABCAAGBQJYXIOMAAoJEFAslq9JXcLZTzcQAJ4oLuACMTRt4O5q8IIg+Jwl +kjB4Eipbx2yudAkdpCTxGBzRzzHwfY8/3MRET+82Uvnc+Uq93doas9OTnMV4h43w +kBMYOENKllUp4GLQCj3tLBAvvqFl0cwlcJqyObOBIYbDG58cRR/avZ0VxDWc6gaN +rHNSe7rnVHZJQ249yG4NMCdhTr50Rc5pu5GsyCBb26HFn88fiEDOC7Q+YqcQ+MSc +2ptixpUJXq3EK7UB20CGvtvU+QFZRNvr+sNtMKNucx3u3Q5lgUG4hJMpGQ2MHVIG +R3LMmE4dKemGtOvYkIgqx2hGqPRuTcE+yG5iVVcU08cfFSpOxiVijT7cC4YDR5ZA +WjSLLPPOZipedFuHbfZnoToQCiWPE7G+cfFQTXrcno/SD+PVePnC5L1GH02vMPKQ +DCl/+8TjcHqh1yjZvMh/08p73E3w0tQdd2TzoiqK5mYc9rlWS1Q/3YKJ89IllpZ8 +clKZR0eLK7YVNRzWPnD5zJ0C40CMxcKZB/4ZmOuVzkkXGXHy+EZcnFuUQOxufPwN +v5Kwf1FX1ZQ/Hj6gxHckpWZtQdovHezM6mJRwnGYawyIqRn9aj3/SHcgxn2UgjFC +iod7z0h5hEgj9xwPVytmAoW1n+b9Hbj0z2lghZowJ4wLL9+5YfspC3xEyCgCIpH8 +xbsmLJcd4MEUeN6Vm5jk +=nTK9 -----END PGP SIGNATURE-----