cocoapods.rb in fastlane-2.100.1

- old
+ new

@@ -23,11 +23,11 @@
         cmd << '--silent' if params[:silent]
         cmd << '--verbose' if params[:verbose]
         cmd << '--no-ansi' unless params[:ansi]
 
         Actions.sh(cmd.join(' '), error_callback: lambda { |result|
-          if params[:try_repo_update_on_error]
+          if !params[:repo_update] && params[:try_repo_update_on_error]
             cmd << '--repo-update'
             Actions.sh(cmd.join(' '), error_callback: lambda { |retry_result|
               call_error_callback(params, retry_result)
             })
           else
@@ -64,12 +64,11 @@
                                        default_value: true),
           FastlaneCore::ConfigItem.new(key: :repo_update,
                                        env_name: "FL_COCOAPODS_REPO_UPDATE",
                                        description: "Add `--repo-update` flag to `pod install` command",
                                        is_string: false,
-                                       default_value: false,
-                                       conflicting_options: [:try_repo_update_on_error]),
+                                       default_value: false),
           FastlaneCore::ConfigItem.new(key: :silent,
                                        env_name: "FL_COCOAPODS_SILENT",
                                        description: "Execute command without logging output",
                                        is_string: false,
                                        default_value: false),
@@ -106,11 +105,10 @@
                                        env_name: "FL_COCOAPODS_TRY_REPO_UPDATE_ON_ERROR",
                                        description: 'Retry with --repo-update if action was finished with error',
                                        optional: true,
                                        is_string: false,
                                        default_value: false,
-                                       type: Boolean,
-                                       conflicting_options: [:repo_update])
+                                       type: Boolean)
         ]
         # Please don't add a version parameter to the `cocoapods` action. If you need to specify a version when running
         # `cocoapods`, please start using a Gemfile and lock the version there
         # More information https://docs.fastlane.tools/getting-started/ios/setup/#use-a-gemfile
       end