Diff
Not logged in

Differences From Artifact [1ba1952253]:

To Artifact [f5539b2754]:


772
773
774
775
776
777
778






























779
780
781
782
783
784
785
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
827

828
829
830
831
832
833
834
835

836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
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"]
      }

      set fileName $relativeFileName; # NOTE: For [subst].
      stageOnePackageFile $relativeFileName

      if {[isEagle]} then {
        set fileName [::PackageRepository::formatExecArgument $fileName]

        if {[catch {
          eval exec -success Success [subst $fossilAddCommand]
        } error]} then {
          error [appendArgs \
      stageOnePackageFile [appendArgs $relativeFileName .asc]
              "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 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

1157
1158





1159
1160
1161
1162
1163
1164
1165
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]
            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 {