Skip to content

Commit

Permalink
Optionally skip package installation for addons (related to bsc#1074766)
Browse files Browse the repository at this point in the history
- Display the installation summary tab by default in the package
  manager when adding addons

- 4.0.25
  • Loading branch information
lslezak committed Jan 8, 2018
1 parent 9da878a commit dd6cd80
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
9 changes: 9 additions & 0 deletions package/yast2-packager.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Jan 8 09:49:09 UTC 2018 - lslezak@suse.cz

- Allow different handling handling of addons without
installation.xml file (related to bsc#1074766)
- Display the installation summary tab by default in the package
manager when adding addons
- 4.0.25

-------------------------------------------------------------------
Mon Dec 15 14:07:50 CET 2017 - schubi@suse.de

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-packager.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-packager
Version: 4.0.24
Version: 4.0.25
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Expand Down
10 changes: 6 additions & 4 deletions src/modules/AddOnProduct.rb
Original file line number Diff line number Diff line change
Expand Up @@ -567,8 +567,8 @@ def DoInstall_NoControlFile
)

# display pattern the dialog when there is a pattern provided by the addon
# otherwise use search mode
mode = AnyPatternInRepo() ? :patternSelector : :searchMode
# otherwise use the summary mode
mode = AnyPatternInRepo() ? :patternSelector : :summaryMode
# enable repository management if not in installation mode
enable_repo_management = Mode.normal

Expand Down Expand Up @@ -818,8 +818,10 @@ def RegisterAddOnProduct(src_id)
# Do installation of the add-on product within an installed system
# srcid is got via AddOnProduct::src_id
#
# @param install_packages [Boolean] install the selected packages,
# can be optionally disabled
# @return [Symbol] the result symbol from wizard sequencer
def DoInstall
def DoInstall(install_packages = true)
# Display beta file if such file exists
# Display license and wait for agreement
# Not needed here, license already shown in the workflow
Expand Down Expand Up @@ -855,7 +857,7 @@ def DoInstall
# Fallback -- Repository didn't provide needed control file
# or control file doesn't contain needed stage/mode
# Handling as it was a repository
ret = DoInstall_NoControlFile() if control.nil? || ret.nil?
ret = DoInstall_NoControlFile() if install_packages && (control.nil? || ret.nil?)

Builtins.y2milestone("Result of the add-on installation: %1", ret)

Expand Down

0 comments on commit dd6cd80

Please sign in to comment.