Merge branch 'SLE-15-GA'

yast · May 4, 2018 · 3e8abe6 · 3e8abe6
2 parents 60e72bb + 2145219
commit 3e8abe6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -302,6 +302,9 @@ rmdir $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast
 %dir %{yast_libdir}/autoinstall/clients
 %{yast_libdir}/autoinstall/clients/*.rb
 
+%dir %{yast_libdir}/autoinstall/autoinst_issues
+%{yast_libdir}/autoinstall/autoinst_issues/*.rb
+
 # scripts
 %{_prefix}/lib/YaST2/bin/fetch_image.sh
 %{_prefix}/lib/YaST2/bin/autoyast-initscripts.sh

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -75,6 +75,8 @@ ylib_DATA = \
   lib/autoinstall/partitioning_preprocessor.rb \
   lib/autoinstall/autosetup_helpers.rb \
   lib/autoinstall/storage_proposal.rb \
+  lib/autoinstall/autoinst_issues_presenter.rb \
+  lib/autoinstall/autoinst_issues.rb \
   lib/autoinstall/storage_proposal_issues_presenter.rb
 
 ydialogsdir = @ylibdir@/autoinstall/dialogs
@@ -86,6 +88,13 @@ yclientsdir = @ylibdir@/autoinstall/clients
 yclients_DATA = \
   lib/autoinstall/clients/ayast_probe.rb
 
+ycautoinst_issuesdir = @ylibdir@/autoinstall/autoinst_issues
+ycautoinst_issues_DATA = \
+  lib/autoinstall/autoinst_issues/invalid_value.rb \
+  lib/autoinstall/autoinst_issues/issue.rb \
+  lib/autoinstall/autoinst_issues/list.rb \
+  lib/autoinstall/autoinst_issues/missing_value.rb
+
 scrconf_DATA = \
   scrconf/cfg_autoinstall.scr \
   scrconf/autoinstall.scr