Overview
Comment: | Make sure the OpenPGP signature files are included when staging package files. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
fb013b8d6d98567237467f4ad6c2cdad |
User & Date: | mistachkin on 2016-12-23 01:53:19 |
Other Links: | manifest | tags |
Context
2016-12-23
| ||
02:04 | The targetDirectory variable must be available in the 'stageOnePackageFile' procedure. check-in: 8697b9e9cc user: mistachkin tags: trunk | |
01:53 | Make sure the OpenPGP signature files are included when staging package files. check-in: fb013b8d6d user: mistachkin tags: trunk | |
01:03 | Corrections to error handling for the 'submitEventHandler' procedure. check-in: c29841080c user: mistachkin tags: trunk | |
Changes
Modified client/1.0/neutral/pkgr_upload.eagle from [1ba1952253] to [f5539b2754].
︙ | ︙ | |||
772 773 774 775 776 777 778 779 780 781 782 783 784 785 | } error]} then { error [appendArgs \ "could not change branch: " $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. # # <public> proc stagePackageFiles { language version platform fileNames } { | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 | } error]} then { error [appendArgs \ "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. # # <public> proc stagePackageFiles { language version platform fileNames } { |
︙ | ︙ | |||
820 821 822 823 824 825 826 | if {![::PackageRepository::createOpenPgpSignature \ $checkoutFileName]} then { error [appendArgs \ "could not stage file \"" $fileName \ "\": OpenPGP signing failed"] } | | < < < < < < < | < < < < < < < < < < | 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 | if {![::PackageRepository::createOpenPgpSignature \ $checkoutFileName]} then { error [appendArgs \ "could not stage file \"" $fileName \ "\": OpenPGP signing failed"] } stageOnePackageFile $relativeFileName stageOnePackageFile [appendArgs $relativeFileName .asc] } } # # NOTE: This procedure attempts to commit the staged package files to the # remote package file repository using Fossil. The varName argument # is the name of a scalar variable in the context of the immediate |
︙ | ︙ | |||
1150 1151 1152 1153 1154 1155 1156 | $apiKey $package $patchLevel [string totitle $language] \ $script $certificate] if {!$batchMode} then { set title [appendArgs \ "Package Uploader Client: " [lindex [info level 0] 0]] | > | | > > > | 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 | $apiKey $package $patchLevel [string totitle $language] \ $script $certificate] if {!$batchMode} then { set title [appendArgs \ "Package Uploader Client: " [lindex [info level 0] 0]] 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 } } else { catch { |
︙ | ︙ |
Modified client/1.0/neutral/pkgr_upload.eagle.asc from [a543043424] to [807c36adeb].
1 2 3 4 | -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository | | | | | | | | | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository 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----- |
Modified client/1.0/neutral/pkgr_upload.eagle.harpy from [e26a03573f] to [22a9188b0d].
︙ | ︙ | |||
17 18 19 20 21 22 23 | THE ASSOCIATED SOFTWARE MAY NOT WORK PROPERLY IF THIS FILE IS ALTERED. --> <Certificate xmlns="https://eagle.to/2011/harpy" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <Protocol>None</Protocol> <Vendor>Mistachkin Systems</Vendor> | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | THE ASSOCIATED SOFTWARE MAY NOT WORK PROPERLY IF THIS FILE IS ALTERED. --> <Certificate xmlns="https://eagle.to/2011/harpy" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <Protocol>None</Protocol> <Vendor>Mistachkin Systems</Vendor> <Id>4d5171dc-950f-4d14-aa67-348876d51f50</Id> <HashAlgorithm>SHA512</HashAlgorithm> <EntityType>Script</EntityType> <TimeStamp>2016-12-23T01:52:49.1289062Z</TimeStamp> <Duration>-1.00:00:00</Duration> <Key>0x9559f6017247e3e2</Key> <Signature> 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 </Signature> </Certificate> |
Modified client/1.0/neutral/pkgr_upload.eagle.harpy.asc from [bac67aa222] to [89f0d315f8].
1 2 3 4 | -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository | | | | | | | | | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository 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----- |