yast / yast-yast2

51%

master: 42%

LAST BUILD ON BRANCH file_conflict_fix

branch: file_conflict_fix

CHANGE BRANCH

x

Reset

• file_conflict_fix
• CWM_widgets
• Docker_SLE12-SP2
• HEAD
• Packages.db
• SLE-12-SP1
• SLE-12-SP1_bnc_966413
• SLE-12-SP2
• SLE-12-SP2-CASP
• SLE-12-SP2-CASP_bnc_1012047
• SLE-12-SP2-bnc-1012047
• SLE-12-SP3
• SLE-12-SP4
• SLE-12-SP5
• SLE-15-GA
• SLE-15-GA-1113732
• SLE-15-GA-bnc-1093374
• SLE-15-GA-bsc-1108942
• SLE-15-GA-key
• SLE-15-GA-registration-popup
• SLE-15-SP1
• SLE-15-SP1-bsc-1131503
• SLE-15-SP1-bsc-1136708
• SLE-15-SP1-bsc-1173133
• SLE-15-SP1-bsc-1173133-2
• SLE-15-SP2
• SLE-15-SP2-bsc-1173133
• SLE-15-SP2-bsc-1175681
• SLE-15-SP2-test2
• SLE-15-SP3
• SLE-15-SP5
• SLE-15-SP6
• SLE-15-SP7
• Travis
• abort_default
• abort_handler
• active-states-maintenance
• adapt_kernel
• add-cfa-sysctl-class
• add-changes-api
• add-cwm-popup
• add-errors-to-system-service
• add-hostname-dependency
• add-missing-files
• add-os-release-id-casp
• add-os-release-id-master
• add-product-license-locales
• add-product-spec
• add-support-start-on-boot
• add-system-service-class
• add-systemd-service-build
• add-usr-etc-doc
• add-y2log-to-system-logs
• add-y2log-to-system-logs-master
• add-yast-rake-dependency
• add_hostname
• add_none_method
• add_patterns_to_autoyast
• add_zVM_check
• added_linuxrc_usenbft
• additional_cwm_tests
• agama_kernel_conf
• all-in-one-overview
• allow-asking-by-pv-xen-guest
• alternative_naming
• any-timed-message-fix
• any-timed-message-sp1
• app_icon
• arch_filter
• autoinst-profile-element-path
• backport-from-master
• backport-simpleidn
• backport_kde_fix
• backward_compatible_resolvable
• base_product_fix
• base_products
• better_socket_support
• bootloader_timeout
• bring_back_susefirewall_proposal
• broken-casefold
• broken-pipe
• broken-pipe-sp3
• broken-pipe-sp4
• bsc-1159120
• bsc-1159562/create-var-lib-yast2
• bsc-1177405
• bsc-1177405-2
• bsc-1180142
• bsc-1180142-backport
• bsc-1180954
• bsc-1184131
• bsc-1185561
• bsc-1185561-master
• bsc-1187581-master
• bsc-1187581-sp3
• bsc-1193784
• bsc-1193784-SLE-15-SP3
• bsc-1201924
• bsc-991935
• bsc1149776-report-long-warning
• bsc1151954/fix-module-name-inference
• bsc1176276
• bsc1194453
• bsc_1001454b
• bsc_1001454g
• bsc_1098919
• bsc_1098919_sp4
• bsc_1128459
• bsc_1167523
• bsc_1178688
• bsc_1178688_sp2
• bug_1109812
• bump-version
• caasp_merge
• casp_merge
• casp_merge2
• cfa-nsswitch
• changes_for_cli
• cheetah-link
• cherry_pick_reboot_timeout
• chroot_management
• ci_fix_for_sp2
• cleanup
• cli-unknown-is-error
• cli_read-only
• clipped-arabic-m
• close_progress_popups_master
• close_progress_popups_sp5
• close_progress_popups_sp6
• cmd_line_support
• configuration-management
• content_drop
• contribution_md_update
• control_file_product
• copying_dir
• correct-program-paths
• coveralls
• covert_coverage_report
• ctc-type
• cursor_fix
• cwm-deep-copy
• cwm-files
• cwm-improvements
• cwm-present
• cwm-rspec
• cwm-rspec-rpm
• cwm-rspec2
• cwm-term-kinds
• cwm-tree
• cwm-tree2
• cwm/multi_state_selector
• cwm/restore_richtext_scroll
• cwm_doc_improve
• cwm_firewall_ux
• cwm_improvements
• cwm_improvements2
• cwm_table
• cwm_wrapper
• date_and_time_widgets
• delete_contributing_file
• dependency_fix
• deprecate_itanium
• desktop_doc
• detect_wsl2_backport
• directed-richtext
• disable_buttons_cwm
• discourages-old-url-modules
• discourages-old-url-modules-master
• discoverable-docs
• display_name
• do-not-crash-base-nil
• doc-getfeature
• doc-port-ranges
• doc-sfw-services
• doc_improve
• doc_improvement
• docker_at_travis
• document-doc-team-id
• document-resource-aliases
• document-section-with-attributes-class
• document_new_error_proposal_behavior
• documentation
• done-provide-io-error
• dont-cover-tests
• download_error_popup
• drop-dns
• drop-language-dependency
• drop_any_xml
• drop_mkinitrd
• drop_old_testsuite
• drop_subscription_tools
• drop_susefirewall_code
• drop_unsupported_technologies
• ensure_close_scr_instance
• ensure_installation_source_dir
• eql_hash
• execute_improve
• expanded_ids
• experimental_rubocop
• extend-service-api
• extend_api_ga
• extend_firewall_api
• extend_issues
• extend_workflow_package
• fallback_hicolor
• fate_319639
• feature/add-help-for-service-widget
• feature/fate-325482-display-the-license
• feature/fate-325482-fsh-skelcd
• feature/fix-changelog
• feature/increase-systemctl-timeout
• feature/merge-sle-15-ga-increase-timeout
• feature/reorganize-yast2-service-classes
• feature/require-tar-for-yast2-logs
• feature/rescue-systemctlerror-saving-start-mode
• feature/system_service
• file_conflict_callbacks
• filter-sysctl-files
• filter-sysctl-files-sp2
• filter-sysctl-files-sp3
• find_base_product
• firewall_ay_config
• firewall_chooser
• firewall_fix
• firewalld_fixes
• fix-1011869-workflow-manager
• fix-1011869-workflow-manager-master
• fix-changelog
• fix-changes
• fix-find-many
• fix-is-dom-u
• fix-issue-location
• fix-jira-reference
• fix-license-locales
• fix-login-defs-overrides-name
• fix-multi-file-config
• fix-on-demand-detection
• fix-packages-tests
• fix-product-features
• fix-relnotes-url
• fix-rpm-license-fetcher-test
• fix-ruby-2.5-syntax
• fix-selector-without-opt
• fix-sysctl-yast-conf
• fix-sysctl-yast-conf-path
• fix-translation
• fix-xml-system-id
• fix/desktop-modules-reading
• fix/loading_services_database
• fix_TimedErrorAnyQuestion
• fix_build
• fix_cmdline_parsing
• fix_cmdline_parsing_master
• fix_cwm_help
• fix_deps
• fix_execute
• fix_fileutils
• fix_focus
• fix_frame
• fix_hibernation_typo
• fix_menu_invocation
• fix_not_show
• fix_object_wrapper_usage
• fix_overlay
• fix_packaging
• fix_refinements
• fix_replace_widget
• fix_repo_init_sp3
• fix_running_gnome_center
• fix_running_gnome_center_sle_12_sp3
• fix_save_y2logs
• fix_service_status
• fix_showing_details
• fix_submission
• fix_systemctl
• fix_tests
• fix_testsuite_dns-server
• fix_typo
• fix_up
• fix_wrong_url_cache
• fix_xen_detection
• fix_zones_reader
• fix_zones_reader_sp6
• fixed_label
• fixup
• force-package-backend
• fs_snapshot_pre
• fstab_agent_test
• fstab_agent_whitespace
• fw-interfaces-read
• get_back_susefirewall
• github_actions
• github_actions_15.4
• handle-release-notes-error
• hardening
• help_icons
• hires_icon
• honor_y2style_env
• huha-dl-progress
• huha-dl-progress-master
• huha-doc-ext-calls
• huha-drop-scripts
• huha-force-ui
• huha-hostname-15-5
• huha-hostname-15-6
• huha-hostname-master
• huha-merge-15-sp3
• huha-merge-15-sp3-to-master
• huha-plugins
• huha-replace-widget
• huha-restore-missing
• huha-revert-ld-preload
• huha-revert-restore
• huha-show-product-master
• huha-sysctl-err
• idnconv-to-simpleidn
• ifconfig_agent
• import-y2packager-stuff
• improve-on-demand-handling
• improve-socket-detection
• improve-text-helpers
• improve_cwm_dialog
• improve_doc
• improve_multi_status_selector
• improve_view_anymsg
• init_fixup_master
• init_target
• installation_repos
• interface_object
• interface_zone
• invalid_utf8
• ipoib_mode_detection
• is_wsl
• jing_container_test
• keyboard_layout_widget
• leap_15.3_migration
• libera.chat
• license_api
• license_api_poc
• license_formatting
• list_all_cards_in_fw
• live_inst_network
• logging
• low-vision
• makefile_susefirewall_proposal
• man_page
• masquerade_modify
• master
• master-1132650
• master-base-product-logging
• master-bsc-1108942
• master-bsc-1108942-2
• master-bsc-1113732
• master-bsc-1129426
• master-bsc-1129426-2
• master-bsc-1131503
• master-bsc-1136708
• master-bsc-1140027-2
• master-bsc-1151649
• master-bsc-1151649-2
• master-bsc-1151649-3
• master-bsc-1170322
• master-bsc-1173133
• master-bsc-1175494
• master-bsc-821267
• master-fate-325737
• master-fate-325834
• master-fate-327099
• master-issue-report
• master-issue-report-2
• master-issue-report-3
• master-reduce-AY-clone-output
• master-registration-popup
• md5-to-sha1
• menu_in_container
• merge-15ga
• merge-document-resource-aliases
• merge-product-class
• merge-sle-12-sp2-into-master
• merge-sle-15
• merge-sle-15-ga-fix-changelog
• merge-sle-15-ga-socket-detection
• merge-sle-15-ga-to-master
• merge-sle-15-sp1
• merge-sle-15-sp2
• merge-sle-15-sp3
• merge-sle-15-system-service-support
• merge-sle15-sp2
• merge_15
• merge_SLE-12-SP2
• merge_SLE-12-SP3
• merge_SLE-12-SP4
• merge_SLE-15-GA
• merge_SLE-15-SP1
• merge_SLE-15-SP2
• merge_SLE-15-SP4
• merge_SLE-15-SP6
• merge_SLE12
• merge_after_SP2_release
• merge_after_SP2_release_bnc_966413
• merge_module_extensions
• merge_sp1
• merge_sp2
• merge_sp3
• merge_utf8_fix
• missing_changes
• missing_translation
• modified_zones
• module_stub
• move-product-selection-to-welcome
• move-product-upgrade
• move-release-notes-button
• multi_status_alignment
• multiple_provides
• nested_replace_point_help
• nested_widgets
• network_service_use
• new_core_fix
• new_rubocop
• no-tmpnam
• no-xversion
• no_button
• no_solver
• obs_docker_image
• obsolete-devel-doc
• old_repositories
• on_target
• online_update
• optional_patterns
• package-ai
• package_callbacks_cleaning
• package_provided_log
• package_status_fix_bsc1151824
• package_system_container
• packager-ng
• packager-ng-model
• packager_fix_sp4_merge
• packages_in_container
• partitioner-ui-03
• pkg-gpg-check
• plain_text_helper
• popup2
• popup2_autowrap
• popup_autowrap
• potfiles-fix
• product_filtering
• product_init
• product_selection
• proposal-docs
• propose_hibernation
• public_methods
• punycode-to-simpleidn
• query_current_items
• query_forced_base_product
• read-vendored-login-defs
• read_after_write
• read_agama_dir
• read_installinf_instsys
• readline
• recommends
• redirect-to-ui-servicestatus
• reduce-exported-profile
• reduce-profile-on-demand
• reduce_build_time
• reduce_firewall_api
• reduced_recorder
• reduced_snapshotting
• refresh_ui
• register-target
• rel_notes
• relurl
• relurl_ftp_fix
• relurl_test_fix
• remove-old-sysctl-conf-values
• remove_contribute
• remove_ip_addresses
• remove_obsolete_products
• remove_service_offline
• remove_useless_solver
• rename-start-mode
• repo_fix_sp3
• repository_refresh
• reset_api_after_auto
• resolvables_exception
• restart_file_cleanup
• return-zone-object
• return_value_auto_client
• revert_combobox_value=
• revert_current_items
• revert_docker_workaround
• revert_hibernation
• revert_hibernation_sp3
• review_150826_checking_cpuinfo_flags_correctly
• review_160401_uptime_call
• review_160404_ylib_data
• review_160531_just_a_test
• review_160825_timeout_error_reports
• review_161018_master_bnc_966413
• review_161116_missing_include
• review_170928_disable_remote_installation
• review_171211_bnc_1061754
• review_180109_double_entries
• review_180110_append_modules_handling
• review_180112_missing_package
• review_180125_checking_package_installed
• review_180130_xvnc_socket_disabled
• review_180227_set_log_denied
• review_180523_merged_with_sles15
• review_180629_merged_with_sles15
• rspec-kw-args-more
• rspec-kw-hash
• rtl
• rubocop_drop_susefirewall_excludes
• rubocop_update
• ruby-lint
• ruby2.5_fix
• ruby24
• ruby3
• ruby3-2
• ruby32-uri
• ruby34
• running_chrooted_fix
• runtime_to_permanent
• save_y2log
• secret_attributes
• service-classes
• service-classes-fixup
• service_widget_default
• service_widget_default_sp1
• services_widget
• short_name_control_product
• simplify-fs-snapshot
• simplify_examples
• simplify_slideshow
• skelcd_update_bsc1101016
• skip_license_fetcher
• skip_license_fetcher_sp1
• skip_store_for
• sle-15-ga-on-demand-services
• sle-9109/online-search
• slehpc_sp3
• small_improvements
• socket_feature_branch
• socket_widget
• sorbet
• sorbet-typebug-demo
• sp1_yard_fix
• sp2_merge
• sp3_merge
• sp3_merge2
• special_product
• speedup_wsl
• split_github_actions
• stack_fix
• static-services-support
• static-services-support-master
• subscription-tools-not-found
• support_alternative_input
• suppress_feedback
• survive_non_existing_file
• suse_bzilla
• sw_02
• sw_03
• sw_04
• sw_05
• sw_08
• sw_09
• sw_10
• sw_100
• sw_11
• sw_20
• symmetric_gpg
• system-role
• system-service-save
• system_roles_enhancement
• system_service
• systemctl_options
• systemd-service-find-missing
• systemd_running
• systemd_table
• test_fix
• test_fix2
• testsuite_fix
• transaction_packages
• translation_fix
• travis_locale_fix
• ui_hints
• unify-package-rb
• unify_rubocop
• unsigned_package
• unused-version
• update_progress
• upgraded_product
• url_no_host_schemes
• use-meaningful-button-labels
• use-package
• use-packagesystem
• users_api
• verify-mocks
• wayland
• with_extension
• workaround_ruby24_crash
• wsl_whitelist
• xml_dep
• xml_exceptions_handling
• xml_nil_file
• xml_parser
• xml_validation
• xml_validation_param
• y2logs_rewrite
• y2packager_integration
• y2users
• yast2-issues
• yast2-package-split
• yast_execute
• zypper_vars

Build # 1039

Build Type

push

travis-ci

Committed by lslezak

Commit Message

Fixed displaying the file conflicts callbacks (bsc#983464)

...when the Progress dialog is not displayed

- 3.1.193

Run Details

5 of 5 new or added lines in 1 file covered. (100.0%)

7294 of 14437 relevant lines covered (50.52%)

3.03 hits per line