Merge 75f8dfa into d241b56

yast · Jun 10, 2020 · 6f68070 · 6f68070
2 parents d241b56 + 75f8dfa
commit 6f68070
Show file tree

Hide file tree

Showing 18 changed files with 491 additions and 393 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -0,0 +1,97 @@
+# use the shared Yast defaults
+inherit_from:
+  /usr/share/YaST2/data/devtools/data/rubocop-0.71.0_yast_style.yml
+
+# this needs more testing if we can have frozen string literals
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: AllowKeywordBlockArguments.
+Lint/UnderscorePrefixedVariableName:
+  Exclude:
+    - 'src/include/add-on/add-on-workflow.rb'
+
+Naming/MethodName:
+  Enabled: false
+
+Naming/VariableName:
+  Enabled: false
+
+Lint/Loop:
+  Enabled: false
+
+# Offense count: 11
+Metrics/AbcSize:
+  Max: 200
+
+# Offense count: 24
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 350
+
+# Offense count: 5
+# Configuration parameters: CountBlocks.
+Metrics/BlockNesting:
+  Max: 4
+
+# Offense count: 11
+Metrics/CyclomaticComplexity:
+  Max: 40
+
+# Offense count: 12
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 122
+
+# Offense count: 16
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 280
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 1400
+
+# Offense count: 2
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 7
+
+# Offense count: 10
+Metrics/PerceivedComplexity:
+  Max: 41
+
+# Offense count: 10
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - 'src/clients/add-on.rb'
+    - 'src/clients/add-on_auto.rb'
+    - 'src/clients/add-on_proposal.rb'
+    - 'src/clients/inst_add-on.rb'
+    - 'src/clients/inst_add-on_software.rb'
+    - 'src/include/add-on/add-on-workflow.rb'
+    - 'src/lib/add-on/clients/add-on_auto.rb'
+    - 'src/lib/add-on/clients/inst_add-on.rb'
+    - 'src/modules/AddOnOthers.rb'
+    - 'test/y2add_on/clients/inst_add-on_test.rb'
+
+# Offense count: 8
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'src/clients/add-on.rb'
+    - 'src/clients/add-on_proposal.rb'
+    - 'src/clients/inst_add-on_software.rb'
+    - 'src/clients/vendor.rb'
+    - 'src/include/add-on/add-on-workflow.rb'
+    - 'src/include/add-on/misc.rb'
+    - 'src/lib/add-on/clients/add-on_auto.rb'
+    - 'src/modules/AddOnOthers.rb'
diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,7 @@
 require "yast/rake"
 
 Yast::Tasks.configuration do |conf|
-  #lets ignore license check for now
+  # lets ignore license check for now
   conf.skip_license_check << /.*/
   conf.install_locations["doc/autodocs"] = conf.install_doc_dir
 end
diff --git a/package/yast2-add-on.changes b/package/yast2-add-on.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 10 14:04:00 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
+
+- Reduce autoyast profile size if addons are empty (bsc#1172749) 
+- 4.3.1
+
 -------------------------------------------------------------------
 Thu May  7 08:58:18 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
 

diff --git a/package/yast2-add-on.spec b/package/yast2-add-on.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-add-on
-Version:        4.3.0
+Version:        4.3.1
 Release:        0
 Summary:        YaST2 - Add-On media installation code
 License:        GPL-2.0-only

diff --git a/src/clients/add-on.rb b/src/clients/add-on.rb
@@ -1,9 +1,7 @@
-# encoding: utf-8
-
-# File:	clients/add-on.ycp
-# Package:	yast2-installation
-# Summary:	Install an add-on product
-# Authors:	Jiri Srain <jsrain@suse.de>
+# File:  clients/add-on.ycp
+# Package:  yast2-installation
+# Summary:  Install an add-on product
+# Authors:  Jiri Srain <jsrain@suse.de>
 #
 module Yast
   class AddOnClient < Client
@@ -33,7 +31,7 @@ def main
               "interface, use '%{zypper}' instead for adding a new repository or " \
               "'%{SUSEConnect}' to register a new add-on."
           ),
-          { zypper: "zypper", SUSEConnect: "SUSEConnect" }
+          zypper: "zypper", SUSEConnect: "SUSEConnect"
         ),
         "guihandler" => fun_ref(method(:run_GUI), "symbol ()")
       )

diff --git a/src/clients/add-on_proposal.rb b/src/clients/add-on_proposal.rb
@@ -1,12 +1,10 @@
-# encoding: utf-8
-
-# File:	add-on_proposal.ycp
+# File:  add-on_proposal.ycp
 #
-# Authors:	Jiri Srain <jsrain@suse.cz>
+# Authors:  Jiri Srain <jsrain@suse.cz>
 #
-# Purpose:	Proposal function dispatcher - add-no products
+# Purpose:  Proposal function dispatcher - add-no products
 #
-#		See also file proposal-API.txt for details.
+#    See also file proposal-API.txt for details.
 module Yast
   class AddOnProposalClient < Client
     def main
@@ -32,13 +30,13 @@ def main
         @items = Builtins.maplist(AddOnProduct.add_on_products) do |product|
           data = Pkg.SourceGeneralData(Ops.get_integer(product, "media", -1))
           # placeholder for unknown path
-          dir = Ops.get_locale(data, "product_dir", product.fetch( "product_dir", _("Unknown")))
+          dir = Ops.get_locale(data, "product_dir", product.fetch("product_dir", _("Unknown")))
           dir = "/" if dir == ""
           # summary item, %1 is product name, %2 media URL, %3 directory on media
           Builtins.sformat(
             "%1 (Media %2, directory %3)",
             Ops.get_string(product, "product", _("No name defined")),
-            Ops.get_locale(data, "url", product.fetch( "media_url", _("Unknown"))),
+            Ops.get_locale(data, "url", product.fetch("media_url", _("Unknown"))),
             dir
           )
         end

diff --git a/src/clients/inst_add-on_software.rb b/src/clients/inst_add-on_software.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # File: inst_add-on_software.ycp
 #
 # Client providing the software overview/selection to be used
@@ -83,7 +81,7 @@ def main
 
       # Call the package selector
       # Since yast2 >= 2.17.58
-      @ret = PackagesUI.RunPackageSelector({ "mode" => @run_in_mode })
+      @ret = PackagesUI.RunPackageSelector("mode" => @run_in_mode)
       Builtins.y2milestone("RunPackageSelector returned %1", @ret)
 
       @dialog_ret = :next
@@ -96,9 +94,9 @@ def main
           Builtins.y2milestone("Selected resolvables will be installed now")
 
           if WFM.CallFunction(
-              "inst_rpmcopy",
-              [GetInstArgs.Buttons(false, false)]
-            ) == :abort
+            "inst_rpmcopy",
+            [GetInstArgs.Buttons(false, false)]
+          ) == :abort
             @dialog_ret = :abort
           else
             Kernel.InformAboutKernelChange

diff --git a/src/clients/vendor.rb b/src/clients/vendor.rb
@@ -1,9 +1,7 @@
-# encoding: utf-8
-
-# File:	clients/vendor.ycp
-# Package:	yast2-add-on
-# Summary:	Load vendor driver CD
-# Authors:	Klaus Kaempf <kkaempf@suse.de>
+# File:  clients/vendor.ycp
+# Package:  yast2-add-on
+# Summary:  Load vendor driver CD
+# Authors:  Klaus Kaempf <kkaempf@suse.de>
 #
 # $Id$
 
@@ -70,9 +68,9 @@ def main
       # try to mount device
 
       while SCR.Execute(
-          path(".target.mount"),
-          [@default_device, Installation.sourcedir]
-        ) == false
+        path(".target.mount"),
+        [@default_device, Installation.sourcedir]
+      ) == false
         # VENDOR: cant mount /dev/cdrom popup
         if !Popup.ContinueCancel(_("Please insert the vendor CD-ROM"))
           UI.CloseDialog
@@ -86,7 +84,6 @@ def main
 
       @cdpath = Installation.sourcedir
 
-
       # get directory on update disk from installation (value from install.inf)
       #
       # if not set, determine directory from installed products
@@ -100,13 +97,13 @@ def main
       else
         Pkg.TargetInit("/", false)
 
-        base = Y2Packager::Resolvable.find(kind: :product,
-           status:   :installed,
-           category: "base")
+        base = Y2Packager::Resolvable.find(kind:     :product,
+                                           status:   :installed,
+                                           category: "base")
         if base.empty?
           # fallback
-          base = Y2Packager::Resolvable.find(kind: :product,
-            status: :installed)
+          base = Y2Packager::Resolvable.find(kind:   :product,
+                                             status: :installed)
         end
         version = base[0] ? base[0].version_version : ""
 
@@ -128,7 +125,7 @@ def main
 
         @dirlist2 = Convert.to_list(SCR.Read(path(".target.dir"), @cdpath))
         if Ops.less_or_equal(Builtins.size(@dirlist2), 0) ||
-            !(Builtins.contains(@dirlist2, "suse"))
+            !Builtins.contains(@dirlist2, "suse")
           # VENDOR: vendor cd contains wrong data
           return wrong_cd(
             _("Could not find driver data on the CD-ROM.\nAborting now."),
@@ -146,8 +143,8 @@ def main
 
       @dirlist = Convert.convert(
         SCR.Read(path(".target.dir"), @cdpath),
-        :from => "any",
-        :to   => "list <string>"
+        from: "any",
+        to:   "list <string>"
       )
       if Ops.less_or_equal(Builtins.size(@dirlist), 0)
         # VENDOR: vendor cd doesn't contain data for current system and linux version
@@ -185,9 +182,7 @@ def main
       @inst_count = 0
 
       @short_lang = ""
-      if Ops.greater_than(Builtins.size(@language), 2)
-        @short_lang = Builtins.substring(@language, 0, 2)
-      end
+      @short_lang = Builtins.substring(@language, 0, 2) if Ops.greater_than(Builtins.size(@language), 2)
 
       # try to load .inst files, try with (xx_XX) ISO language first,
       # then with 2 char language code
@@ -259,15 +254,15 @@ def main
       end
 
       @result_message = ""
-      if Ops.greater_than(@inst_count, 0)
+      @result_message = if Ops.greater_than(@inst_count, 0)
         # VENDOR: message box with number of drivers installed
-        @result_message = Builtins.sformat(
+        Builtins.sformat(
           _("Installed %1 drivers from CD"),
           @inst_count
         )
       else
         # VENDOR: message box with error text
-        @result_message = _(
+        _(
           "No driver data found on the CD-ROM.\nAborting now."
         )
       end
@@ -278,7 +273,7 @@ def main
       SCR.Execute(path(".target.umount"), Installation.sourcedir)
 
       UI.CloseDialog
-      :ok 
+      :ok
 
       # EOF
     end