From 7cda1a6c6c83066b2786ab4348c96d3f672e65e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?=
Date: Thu, 9 Jun 2016 15:12:34 +0200
Subject: [PATCH] Fixed Style/ClosingParenthesisIndentation
---
.../commandline/src/modules/CommandLine.rb | 4 +-
library/control/src/modules/DebugHooks.rb | 10 +-
library/control/src/modules/ProductControl.rb | 8 +-
.../control/src/modules/WorkflowManager.rb | 4 +-
library/cwm/src/modules/CWM.rb | 2 +-
library/cwm/src/modules/CWMTsigKeys.rb | 6 +-
library/general/src/modules/Arch.rb | 2 +-
library/general/src/modules/AsciiFile.rb | 8 +-
library/general/src/modules/Distro.rb | 2 +-
library/general/src/modules/FileUtils.rb | 2 +-
library/general/src/modules/Linuxrc.rb | 2 +-
library/general/src/modules/Misc.rb | 2 +-
library/general/src/modules/Mode.rb | 4 +-
library/general/src/modules/Stage.rb | 2 +-
library/gpg/src/modules/GPG.rb | 2 +-
library/log/src/modules/LogViewCore.rb | 2 +-
.../network/src/lib/network/susefirewall2.rb | 4 +-
.../src/lib/network/susefirewall2services.rb | 6 +-
.../src/modules/CWMFirewallInterfaces.rb | 10 +-
library/network/src/modules/Internet.rb | 2 +-
library/network/src/modules/NetworkConfig.rb | 2 +-
.../network/src/modules/NetworkInterfaces.rb | 18 +-
library/network/src/modules/PortRanges.rb | 4 +-
.../src/lib/packages/dummy_callbacks.rb | 70 +--
.../packages/src/modules/PackageCallbacks.rb | 442 +++++++++---------
library/packages/src/modules/PackageSystem.rb | 2 +-
library/packages/src/modules/PackagesUI.rb | 2 +-
library/packages/src/modules/Product.rb | 4 +-
.../src/modules/SignatureCheckCallbacks.rb | 10 +-
.../src/modules/SignatureCheckDialogs.rb | 4 +-
library/packages/src/modules/SlideShow.rb | 2 +-
library/packages/test/product_test.rb | 4 +-
library/system/src/lib/yast2/fs_snapshot.rb | 2 +-
library/system/src/modules/FileChanges.rb | 2 +-
library/system/src/modules/Initrd.rb | 2 +-
library/system/src/modules/ModuleLoading.rb | 2 +-
library/systemd/test/test_helper.rb | 18 +-
library/types/src/modules/Punycode.rb | 4 +-
library/types/src/modules/URL.rb | 4 +-
library/wizard/src/modules/Confirm.rb | 2 +-
40 files changed, 342 insertions(+), 342 deletions(-)
diff --git a/library/commandline/src/modules/CommandLine.rb b/library/commandline/src/modules/CommandLine.rb
index d25166f4b..aab2a957e 100644
--- a/library/commandline/src/modules/CommandLine.rb
+++ b/library/commandline/src/modules/CommandLine.rb
@@ -1155,7 +1155,7 @@ def Init(cmdlineinfo, args)
if !Builtins.haskey(
Ops.get_map(cmdlineinfo, "actions", {}),
mapaction
- )
+ )
Builtins.y2error(
"Command line specification maps undefined action '%1'",
mapaction
@@ -1171,7 +1171,7 @@ def Init(cmdlineinfo, args)
if !Builtins.haskey(
Ops.get_map(cmdlineinfo, "options", {}),
Convert.to_string(mapopt)
- )
+ )
Builtins.y2error(
"Command line specification maps undefined option '%1' for action '%2'",
mapopt,
diff --git a/library/control/src/modules/DebugHooks.rb b/library/control/src/modules/DebugHooks.rb
index 687334b2f..6598d4ff8 100644
--- a/library/control/src/modules/DebugHooks.rb
+++ b/library/control/src/modules/DebugHooks.rb
@@ -56,7 +56,7 @@ def Checkpoint(filename, at_entry)
if Ops.greater_or_equal(
WFM.Read(path(".local.size"), Ops.add("/tmp/", filename)),
0
- )
+ )
if at_entry
Popup.Message(Builtins.sformat("Entry: %1", filename))
else
@@ -111,7 +111,7 @@ def Run(filename, at_entry)
Builtins.sformat("%1/%2_pre.sh", @tmp_dir, filename)
),
0
- )
+ )
ExecuteScript(Builtins.sformat("%1_pre.sh", filename), "shell")
elsif Ops.greater_than(
WFM.Read(
@@ -119,7 +119,7 @@ def Run(filename, at_entry)
Builtins.sformat("%1/%2_pre.pl", @tmp_dir, filename)
),
0
- )
+ )
ExecuteScript(Builtins.sformat("%1_pre.pl", filename), "perl")
else
Builtins.y2debug(
@@ -135,7 +135,7 @@ def Run(filename, at_entry)
Builtins.sformat("%1/%2_post.sh", @tmp_dir, filename)
),
0
- )
+ )
ExecuteScript(Builtins.sformat("%1_post.sh", filename), "shell")
elsif Ops.greater_than(
WFM.Read(
@@ -143,7 +143,7 @@ def Run(filename, at_entry)
Builtins.sformat("%1/%2_post.pl", @tmp_dir, filename)
),
0
- )
+ )
ExecuteScript(Builtins.sformat("%1_post.pl", filename), "perl")
else
Builtins.y2debug(
diff --git a/library/control/src/modules/ProductControl.rb b/library/control/src/modules/ProductControl.rb
index 9209be054..25ae04944 100644
--- a/library/control/src/modules/ProductControl.rb
+++ b/library/control/src/modules/ProductControl.rb
@@ -262,7 +262,7 @@ def checkDisabled(mod)
if Builtins.contains(
@DisabledProposals,
Ops.get_string(mod, "proposal", "")
- )
+ )
return true
end
# Normal step
@@ -311,7 +311,7 @@ def ReadControlFile(controlfile)
Ops.get_list(@productControl, ["partitioning", "partitions"], [])
),
0
- )
+ )
partitioning = Ops.get_map(@productControl, "partitioning", {})
ProductFeatures.SetBooleanFeature(
"partitioning",
@@ -1350,7 +1350,7 @@ def RunFrom(from, allow_back)
path(".target.string"),
Installation.current_step,
step_id
- )
+ )
Builtins.y2error("Error writing step identifier")
end
end
@@ -1384,7 +1384,7 @@ def RunFrom(from, allow_back)
!Stage.initial
if !Convert.to_boolean(
SCR.Execute(path(".target.remove"), Installation.current_step)
- )
+ )
Builtins.y2error("Error removing step identifier")
end
end
diff --git a/library/control/src/modules/WorkflowManager.rb b/library/control/src/modules/WorkflowManager.rb
index cb9849762..071e1ad9d 100644
--- a/library/control/src/modules/WorkflowManager.rb
+++ b/library/control/src/modules/WorkflowManager.rb
@@ -1218,7 +1218,7 @@ def IntegrateWorkflow(filename)
Ops.get_map(update_file, "update", {}),
name,
Ops.get_string(update_file, "textdomain", "control")
- )
+ )
Builtins.y2error("Failed to update installation workflow")
return false
end
@@ -1240,7 +1240,7 @@ def IntegrateWorkflow(filename)
if !UpdateInstFinish(
Ops.get_map(update_file, ["update", "inst_finish"], {})
- )
+ )
Builtins.y2error("Adding inst_finish steps failed")
return false
end
diff --git a/library/cwm/src/modules/CWM.rb b/library/cwm/src/modules/CWM.rb
index 7139cbdc7..d8c82f08f 100644
--- a/library/cwm/src/modules/CWM.rb
+++ b/library/cwm/src/modules/CWM.rb
@@ -669,7 +669,7 @@ def validateWidget(widget, event, key)
if !Builtins.regexpmatch(
Convert.to_string(UI.QueryWidget(Id(:_tp_value), :Value)),
regexp
- )
+ )
failed = true
end
elsif val_type == :list
diff --git a/library/cwm/src/modules/CWMTsigKeys.rb b/library/cwm/src/modules/CWMTsigKeys.rb
index ce49adc6c..ea8b69d8a 100644
--- a/library/cwm/src/modules/CWMTsigKeys.rb
+++ b/library/cwm/src/modules/CWMTsigKeys.rb
@@ -373,7 +373,7 @@ def Handle(widget, _key, event)
# yes-no popup
if !Popup.YesNo(
_("The key with the specified ID exists and is used.\nRemove it?")
- )
+ )
return nil
else
remove_file = Key2File(key2)
@@ -395,7 +395,7 @@ def Handle(widget, _key, event)
_(
"A key with the specified ID was found\non your disk. Remove it?"
)
- )
+ )
SCR.Execute(
path(".target.bash"),
Builtins.sformat(
@@ -464,7 +464,7 @@ def Handle(widget, _key, event)
"identifier as some of already present keys.\n" \
"Old keys will be removed. Continue?"
)
- )
+ )
return nil
else
Builtins.foreach(coliding_files) { |f| RemoveTSIGKeyFile(f) }
diff --git a/library/general/src/modules/Arch.rb b/library/general/src/modules/Arch.rb
index dc46676a3..02d0cc82d 100644
--- a/library/general/src/modules/Arch.rb
+++ b/library/general/src/modules/Arch.rb
@@ -231,7 +231,7 @@ def board_compatible
if Builtins.issubstring(
Ops.get_string(device_type, "stdout", ""),
"chrp"
- )
+ )
@_board_compatible = "CHRP"
end
# Maple has its own way of pretenting OF1275 compliance
diff --git a/library/general/src/modules/AsciiFile.rb b/library/general/src/modules/AsciiFile.rb
index 188d86dcf..da3e5ca68 100644
--- a/library/general/src/modules/AsciiFile.rb
+++ b/library/general/src/modules/AsciiFile.rb
@@ -115,7 +115,7 @@ def AssertLineValid(file, line)
if Ops.less_than(
Builtins.size(text),
Ops.get_integer(file.value, ["widths", num], 0)
- )
+ )
lstr = Ops.add(
lstr,
Builtins.substring(
@@ -157,7 +157,7 @@ def ReadFile(file, pathname)
if Ops.greater_than(
Builtins.size(Ops.get_string(file.value, "comment", "")),
0
- ) &&
+ ) &&
Builtins.regexpmatch(
line,
Ops.get_string(file.value, "comment", "")
@@ -266,13 +266,13 @@ def ChangeLineField(file, line, field, entry)
if Ops.less_than(
Builtins.size(Ops.get_list(file.value, ["l", line, "fields"], [])),
field
- )
+ )
changed = true
i = 0
while Ops.less_than(i, field)
if Builtins.size(
Ops.get_string(file.value, ["l", line, "fields", i], "")
- ) == 0
+ ) == 0
Ops.set(file.value, ["l", line, "fields", i], "")
end
i = Ops.add(i, 1)
diff --git a/library/general/src/modules/Distro.rb b/library/general/src/modules/Distro.rb
index 80bba41b3..eebf87607 100644
--- a/library/general/src/modules/Distro.rb
+++ b/library/general/src/modules/Distro.rb
@@ -68,7 +68,7 @@ def debian
if SCR.Execute(
path(".target.bash"),
"grep DISTRIB_ID=Ubuntu /etc/lsb-release"
- ) == 0
+ ) == 0
@_distro = "debian"
Builtins.y2milestone("Found Debian/Ubuntu")
end
diff --git a/library/general/src/modules/FileUtils.rb b/library/general/src/modules/FileUtils.rb
index 7d360a00c..ad648c04d 100644
--- a/library/general/src/modules/FileUtils.rb
+++ b/library/general/src/modules/FileUtils.rb
@@ -306,7 +306,7 @@ def CheckAndCreatePath(pathvalue)
_("The path %1 does not exist.\nCreate it now?\n"),
pathvalue
)
- )
+ )
# Directory creation successful
if Convert.to_boolean(SCR.Execute(path(".target.mkdir"), check_path))
Builtins.y2milestone(
diff --git a/library/general/src/modules/Linuxrc.rb b/library/general/src/modules/Linuxrc.rb
index 583e873e4..988c4881f 100644
--- a/library/general/src/modules/Linuxrc.rb
+++ b/library/general/src/modules/Linuxrc.rb
@@ -180,7 +180,7 @@ def SaveInstallInf(root)
root
)
)
- ) != 0
+ ) != 0
Builtins.y2error(
"Cannot SaveInstallInf %1 to %2",
inst_if_file,
diff --git a/library/general/src/modules/Misc.rb b/library/general/src/modules/Misc.rb
index b402770ba..4af78836c 100644
--- a/library/general/src/modules/Misc.rb
+++ b/library/general/src/modules/Misc.rb
@@ -123,7 +123,7 @@ def SysconfigWrite(level, values)
if !SCR.Write(
Ops.add(level, Ops.get_path(entry, 0, path("."))),
Ops.get_string(entry, 1, "")
- )
+ )
result = false
end
end
diff --git a/library/general/src/modules/Mode.rb b/library/general/src/modules/Mode.rb
index 4abbfa14e..ff07aa905 100644
--- a/library/general/src/modules/Mode.rb
+++ b/library/general/src/modules/Mode.rb
@@ -175,7 +175,7 @@ def SetMode(new_mode)
"autoupgrade"
],
new_mode
- )
+ )
Builtins.y2error("Unknown mode %1", new_mode)
end
@@ -208,7 +208,7 @@ def SetTest(new_test_mode)
if !Builtins.contains(
["none", "test", "demo", "screenshot", "testsuite"],
new_test_mode
- )
+ )
Builtins.y2error("Unknown test mode %1", new_test_mode)
end
@_test = new_test_mode
diff --git a/library/general/src/modules/Stage.rb b/library/general/src/modules/Stage.rb
index 64fd43b6f..9d4701424 100644
--- a/library/general/src/modules/Stage.rb
+++ b/library/general/src/modules/Stage.rb
@@ -73,7 +73,7 @@ def Set(new_stage)
if !Builtins.contains(
["normal", "initial", "continue", "firstboot", "hardware_probed"],
new_stage
- )
+ )
Builtins.y2error("Unknown stage %1", new_stage)
end
diff --git a/library/gpg/src/modules/GPG.rb b/library/gpg/src/modules/GPG.rb
index f2cbb714f..81b714112 100644
--- a/library/gpg/src/modules/GPG.rb
+++ b/library/gpg/src/modules/GPG.rb
@@ -320,7 +320,7 @@ def SignFile(keyid, file, passphrase, ascii_signature)
SCR.Read(path(".target.size"), Ops.add(file, suffix))
),
0
- )
+ )
# remove the existing key
SCR.Execute(
path(".target.bash"),
diff --git a/library/log/src/modules/LogViewCore.rb b/library/log/src/modules/LogViewCore.rb
index 104487935..d006eb5c7 100644
--- a/library/log/src/modules/LogViewCore.rb
+++ b/library/log/src/modules/LogViewCore.rb
@@ -89,7 +89,7 @@ def DeleteOldLines
if Ops.greater_than(
Ops.subtract(Ops.subtract(Builtins.size(@lines), max_lines), 1),
0
- )
+ )
@lines = Builtins.sublist(
@lines,
Ops.subtract(Ops.subtract(Builtins.size(@lines), max_lines), 1)
diff --git a/library/network/src/lib/network/susefirewall2.rb b/library/network/src/lib/network/susefirewall2.rb
index 8bcdee300..db860176a 100644
--- a/library/network/src/lib/network/susefirewall2.rb
+++ b/library/network/src/lib/network/susefirewall2.rb
@@ -619,7 +619,7 @@ def IsBroadcastAllowed(needed_ports, zone)
if !Builtins.contains(
Ops.get(allowed_ports_divided, "ports", []),
needed_port
- ) &&
+ ) &&
!PortRanges.PortIsInPortranges(
needed_port,
Ops.get(allowed_ports_divided, "port_ranges", [])
@@ -2464,7 +2464,7 @@ def CheckKernelModules
if Ops.greater_or_equal(
Builtins.size(GetServicesAcceptRelated(one_zone)),
0
- )
+ )
Builtins.y2milestone("Some ServicesAcceptRelated are defined")
needs_additional_module = true
raise Break
diff --git a/library/network/src/lib/network/susefirewall2services.rb b/library/network/src/lib/network/susefirewall2services.rb
index 28470f339..1dc013aa9 100644
--- a/library/network/src/lib/network/susefirewall2services.rb
+++ b/library/network/src/lib/network/susefirewall2services.rb
@@ -381,7 +381,7 @@ def ReadServicesDefinedByRPMPackages
if !SCR.RegisterAgent(
path(".firewall_service_definition"),
term(:ag_ini, term(:SysConfigFile, filefullpath))
- )
+ )
log.error "Cannot register agent for #{filefullpath}"
next
end
@@ -415,7 +415,7 @@ def ReadServicesDefinedByRPMPackages
if SCR.RegisterAgent(
path(".firewall_service_metadata"),
term(:ag_ini, GetMetadataAgent(filefullpath))
- )
+ )
Builtins.foreach(@known_metadata) do |metadata_feature, metadata_key|
definition = Convert.to_string(
SCR.Read(
@@ -517,7 +517,7 @@ def SetNeededPortsAndProtocols(service, store_definition)
if !SCR.RegisterAgent(
path(".firewall_service_definition"),
term(:ag_ini, term(:SysConfigFile, filefullpath))
- )
+ )
log.error "Cannot register agent for #{filefullpath}"
return false
end
diff --git a/library/network/src/modules/CWMFirewallInterfaces.rb b/library/network/src/modules/CWMFirewallInterfaces.rb
index 72e87e8e9..51b7e23e7 100644
--- a/library/network/src/modules/CWMFirewallInterfaces.rb
+++ b/library/network/src/modules/CWMFirewallInterfaces.rb
@@ -335,7 +335,7 @@ def InitAllowedInterfaces(services)
service_status,
SuSEFirewall.special_all_interface_zone,
false
- )
+ )
@allowed_interfaces = Convert.convert(
Builtins.union(@allowed_interfaces, interfaces_supported_by_any),
from: "list",
@@ -523,7 +523,7 @@ def InterfacesValidate(_widget, _key, _event)
"\n" \
"Continue?"
)
- )
+ )
return false
end
end
@@ -556,7 +556,7 @@ def InterfacesValidate(_widget, _key, _event)
),
ifaces_list
)
- )
+ )
return false
end
end
@@ -575,7 +575,7 @@ def InterfacesValidate(_widget, _key, _event)
),
ifaces_list
)
- )
+ )
return false
end
end
@@ -629,7 +629,7 @@ def CheckPossbilityToChangeFirewall(new_status)
),
ifaces_list
)
- )
+ )
# all known ifaces are buggy
if Builtins.size(@buggy_ifaces) == Builtins.size(all_ifaces)
return false
diff --git a/library/network/src/modules/Internet.rb b/library/network/src/modules/Internet.rb
index 68faf45eb..453dfed71 100644
--- a/library/network/src/modules/Internet.rb
+++ b/library/network/src/modules/Internet.rb
@@ -145,7 +145,7 @@ def Start(log)
if SCR.Execute(
path(".target.bash"),
Ops.add("/sbin/isdnctrl dial ", @device)
- ) != 0
+ ) != 0
Builtins.y2error("isdnctrl failed")
return false
end
diff --git a/library/network/src/modules/NetworkConfig.rb b/library/network/src/modules/NetworkConfig.rb
index 256979cc6..544979fb5 100644
--- a/library/network/src/modules/NetworkConfig.rb
+++ b/library/network/src/modules/NetworkConfig.rb
@@ -74,7 +74,7 @@ def ReadConfig(config)
if Builtins.regexpmatch(
comment,
Ops.add(Ops.add("^.*## Type:[ \t]*([", String.CLower), "]*).*$")
- )
+ )
comment = Builtins.regexpsub(
comment,
Ops.add(Ops.add("^.*## Type:[ \t]*([", String.CLower), "]*).*$"),
diff --git a/library/network/src/modules/NetworkInterfaces.rb b/library/network/src/modules/NetworkInterfaces.rb
index 7e73f2ad6..c95ed33a5 100644
--- a/library/network/src/modules/NetworkInterfaces.rb
+++ b/library/network/src/modules/NetworkInterfaces.rb
@@ -402,22 +402,22 @@ def GetDeviceTypeName(dev)
if Builtins.regexpmatch(
dev,
Ops.add("^", Ops.get(@DeviceRegex, "modem", ""))
- )
+ )
return _("Modem")
elsif Builtins.regexpmatch(
dev,
Ops.add("^", Ops.get(@DeviceRegex, "netcard", ""))
- )
+ )
return _("Network Card")
elsif Builtins.regexpmatch(
dev,
Ops.add("^", Ops.get(@DeviceRegex, "isdn", ""))
- )
+ )
return _("ISDN")
elsif Builtins.regexpmatch(
dev,
Ops.add("^", Ops.get(@DeviceRegex, "dsl", ""))
- )
+ )
return _("DSL")
else
return _("Unknown")
@@ -874,12 +874,12 @@ def Write(devregex)
if Ops.greater_than(
Builtins.size(Ops.get_string(devmap, "IPADDR", "")),
0
- ) &&
+ ) &&
Builtins.find(Ops.get_string(devmap, "IPADDR", ""), "/") == -1
if Ops.greater_than(
Builtins.size(Ops.get_string(devmap, "IPADDR", "")),
0
- ) &&
+ ) &&
Ops.greater_than(
Builtins.size(Ops.get_string(devmap, "NETMASK", "")),
0
@@ -899,7 +899,7 @@ def Write(devregex)
if Ops.greater_than(
Builtins.size(Ops.get_string(devmap, "IPADDR", "")),
0
- ) &&
+ ) &&
Ops.greater_than(
Builtins.size(Ops.get_string(devmap, "PREFIXLEN", "")),
0
@@ -954,7 +954,7 @@ def Write(devregex)
if Ops.greater_than(
Builtins.size(Ops.get(amap, "IPADDR", "")),
0
- ) &&
+ ) &&
Ops.greater_than(
Builtins.size(Ops.get(amap, "PREFIXLEN", "")),
0
@@ -1115,7 +1115,7 @@ def GetDeviceTypes
if !Builtins.contains(
Builtins.splitstring(Ops.get(@DeviceRegex, "netcard", ""), "|"),
device
- )
+ )
Builtins.y2error(
"%1 is not contained in DeviceRegex[\"netcard\"]",
device
diff --git a/library/network/src/modules/PortRanges.rb b/library/network/src/modules/PortRanges.rb
index f9328d318..a506a4444 100644
--- a/library/network/src/modules/PortRanges.rb
+++ b/library/network/src/modules/PortRanges.rb
@@ -450,7 +450,7 @@ def FlattenServices(old_list, protocol)
if PortIsInPortranges(
Builtins.tostring(Ops.subtract(port_number, 1)),
list_of_ranges
- )
+ )
# Creating fake port range, to be joined with another one
list_of_ranges = Builtins.add(
list_of_ranges,
@@ -460,7 +460,7 @@ def FlattenServices(old_list, protocol)
elsif PortIsInPortranges(
Builtins.tostring(Ops.add(port_number, 1)),
list_of_ranges
- )
+ )
# Creating fake port range, to be joined with another one
list_of_ranges = Builtins.add(
list_of_ranges,
diff --git a/library/packages/src/lib/packages/dummy_callbacks.rb b/library/packages/src/lib/packages/dummy_callbacks.rb
index 915da0f62..9303117f8 100644
--- a/library/packages/src/lib/packages/dummy_callbacks.rb
+++ b/library/packages/src/lib/packages/dummy_callbacks.rb
@@ -59,8 +59,8 @@ def register_process_callbacks
fun_ref(
method(:process_start),
"void (string, list , string)"
- )
- )
+ )
+ )
Yast::Pkg.CallbackProcessProgress(boolean_integer_ref)
Yast::Pkg.CallbackProcessNextStage(void_ref)
Yast::Pkg.CallbackProcessDone(void_ref)
@@ -93,21 +93,21 @@ def done_package(_error, _reason)
def register_provide_callbacks
Yast::Pkg.CallbackStartProvide(
fun_ref(method(:start_provide), "void (string, integer, boolean)")
- )
+ )
Yast::Pkg.CallbackProgressProvide(boolean_integer_ref)
Yast::Pkg.CallbackDoneProvide(
fun_ref(method(:done_provide), "string (integer, string, string)")
- )
+ )
Yast::Pkg.CallbackStartPackage(
fun_ref(
method(:start_package),
"void (string, string, string, integer, boolean)"
- )
- )
+ )
+ )
Yast::Pkg.CallbackProgressPackage(boolean_integer_ref)
Yast::Pkg.CallbackDonePackage(
fun_ref(method(:done_package), "string (integer, string)")
- )
+ )
nil
end
@@ -148,7 +148,7 @@ def string_integer_string(_param1, _param2)
def register_patch_callbacks
Yast::Pkg.CallbackStartDeltaDownload(
fun_ref(method(:void_string_integer), "void (string, integer)")
- )
+ )
Yast::Pkg.CallbackProgressDeltaDownload(boolean_integer_ref)
Yast::Pkg.CallbackProblemDeltaDownload(void_string_ref)
Yast::Pkg.CallbackFinishDeltaDownload(void_ref)
@@ -156,7 +156,7 @@ def register_patch_callbacks
Yast::Pkg.CallbackStartDeltaApply(void_string_ref)
Yast::Pkg.CallbackProgressDeltaApply(
fun_ref(method(:void_integer), "void (integer)")
- )
+ )
Yast::Pkg.CallbackProblemDeltaApply(void_string_ref)
Yast::Pkg.CallbackFinishDeltaApply(void_ref)
@@ -181,11 +181,11 @@ def register_source_create_callbacks
fun_ref(
method(:source_create_error),
"symbol (string, symbol, string)"
- )
- )
+ )
+ )
Yast::Pkg.CallbackSourceCreateEnd(
fun_ref(method(:source_create_end), "void (string, symbol, string)")
- )
+ )
Yast::Pkg.CallbackSourceCreateInit(void_ref)
Yast::Pkg.CallbackSourceCreateDestroy(void_ref)
@@ -215,21 +215,21 @@ def register_source_report_callbacks
fun_ref(
method(:source_report_start),
"void (integer, string, string)"
- )
- )
+ )
+ )
Yast::Pkg.CallbackSourceReportProgress(boolean_integer_ref)
Yast::Pkg.CallbackSourceReportError(
fun_ref(
method(:source_report_error),
"symbol (integer, string, symbol, string)"
- )
- )
+ )
+ )
Yast::Pkg.CallbackSourceReportEnd(
fun_ref(
method(:source_report_end),
"void (integer, string, string, symbol, string)"
- )
- )
+ )
+ )
Yast::Pkg.CallbackSourceReportInit(void_ref)
Yast::Pkg.CallbackSourceReportDestroy(void_ref)
@@ -252,17 +252,17 @@ def register_progress_report_callbacks
fun_ref(
method(:progress_start),
"void (integer, string, boolean, boolean, integer, integer, integer, integer)"
- )
- )
+ )
+ )
Yast::Pkg.CallbackProgressReportProgress(
fun_ref(
method(:progress_progress),
"boolean (integer, integer, integer)"
- )
- )
+ )
+ )
Yast::Pkg.CallbackProgressReportEnd(
fun_ref(method(:void_integer), "void (integer)")
- )
+ )
nil
end
@@ -288,22 +288,22 @@ def register_script_callbacks
fun_ref(
method(:script_start),
"void (string, string, string, string)"
- )
- )
+ )
+ )
Yast::Pkg.CallbackScriptProgress(
fun_ref(method(:script_progress), "boolean (boolean, string)")
- )
+ )
Yast::Pkg.CallbackScriptProblem(
fun_ref(method(:string_string), "string (string)")
- )
+ )
Yast::Pkg.CallbackScriptFinish(void_ref)
Yast::Pkg.CallbackMessage(
fun_ref(
method(:message),
"boolean (string, string, string, string)"
- )
- )
+ )
+ )
nil
end
@@ -313,10 +313,10 @@ def register_scandb_callbacks
Yast::Pkg.CallbackProgressScanDb(boolean_integer_ref)
Yast::Pkg.CallbackErrorScanDb(
fun_ref(method(:string_integer_string), "string (integer, string)")
- )
+ )
Yast::Pkg.CallbackDoneScanDb(
fun_ref(method(:void_integer_string), "void (integer, string)")
- )
+ )
nil
end
@@ -342,16 +342,16 @@ def register_download_callbacks
Yast::Pkg.CallbackInitDownload(void_string_ref)
Yast::Pkg.CallbackStartDownload(
fun_ref(method(:start_download), "void (string, string)")
- )
+ )
Yast::Pkg.CallbackProgressDownload(
fun_ref(
method(:progress_download),
"boolean (integer, integer, integer)"
- )
- )
+ )
+ )
Yast::Pkg.CallbackDoneDownload(
fun_ref(method(:done_download), "void (integer, string)")
- )
+ )
Yast::Pkg.CallbackDestDownload(void_ref)
Yast::Pkg.CallbackStartRefresh(void_ref)
Yast::Pkg.CallbackDoneRefresh(void_ref)
diff --git a/library/packages/src/modules/PackageCallbacks.rb b/library/packages/src/modules/PackageCallbacks.rb
index 8d21f44a5..3bd9b2dd0 100644
--- a/library/packages/src/modules/PackageCallbacks.rb
+++ b/library/packages/src/modules/PackageCallbacks.rb
@@ -148,7 +148,7 @@ def StartProvide(name, archivesize, remote)
if Mode.commandline
CommandLine.PrintVerbose(
Builtins.sformat(_("Downloading package %1 (%2)..."), name, sz)
- )
+ )
else
UI.CloseDialog if @_provide_popup
@@ -156,7 +156,7 @@ def StartProvide(name, archivesize, remote)
Progress.SubprogressType(:progress, 100)
Progress.SubprogressTitle(
Builtins.sformat(_("Downloading package %1 (%2)..."), name, sz)
- )
+ )
else
# popup heading
providebox = progress_box(_("Downloading Package"), name, sz)
@@ -220,7 +220,7 @@ def DoneProvide(error, reason, name)
message = Builtins.sformat(
_("Package %1 is broken, integrity check has failed."),
name
- )
+ )
if Mode.commandline
CommandLine.Print(message)
@@ -255,25 +255,25 @@ def DoneProvide(error, reason, name)
PushButton(Id(:abort), Opt(:cancelButton, :key_F9), Label.AbortButton),
PushButton(Id(:retry), Opt(:customButton), Label.RetryButton),
PushButton(Id(:ignore), Opt(:okButton), Label.IgnoreButton)
- )
+ )
if @showLongInfo
UI.OpenDialog(
Opt(:decorated),
layout_popup(message, button_box, true)
- )
+ )
UI.ReplaceWidget(
Id(:info),
RichText(
Opt(:plainText),
Ops.add(Builtins.sformat(_("Error: %1:"), error), reason)
- )
- )
+ )
+ )
else
UI.OpenDialog(
Opt(:decorated),
layout_popup(message, button_box, false)
- )
+ )
UI.ReplaceWidget(Id(:info), Empty())
end
@@ -302,9 +302,9 @@ def DoneProvide(error, reason, name)
# detail string is appended to the end
Builtins.sformat(_("Error: %1:"), error_symbol),
reason
- )
- )
)
+ )
+ )
else
UI.ReplaceWidget(Id(:info), Empty())
end
@@ -326,8 +326,8 @@ def DoneProvide(error, reason, name)
Popup.Warning(
_(
"Ignoring a download failure may result in a broken system.\nVerify the system later by running the Software Management module.\n"
- )
- )
+ )
+ )
end
return "I"
@@ -368,14 +368,14 @@ def StartPackage(name, _location, _summary, installsize, is_delete)
end,
@_package_name,
sz
- )
- )
+ )
+ )
else
packagebox = progress_box(
is_delete ? _("Uninstalling Package") : _("Installing Package"),
@_package_name,
sz
- )
+ )
UI.OpenDialog(Opt(:decorated), packagebox)
@_package_popup = true
@@ -423,7 +423,7 @@ def DonePackage(error, reason)
"DonePackage(error: %1, reason: '%2')",
error,
reason
- )
+ )
message = Builtins.sformat(
if @_deleting_package
@@ -434,7 +434,7 @@ def DonePackage(error, reason)
_("Installation of package %1 failed.")
end,
@_package_name
- )
+ )
if Mode.commandline
CommandLine.Print(message)
@@ -467,19 +467,19 @@ def DonePackage(error, reason)
PushButton(Id(:abort), Opt(:cancelButton), Label.AbortButton),
PushButton(Id(:retry), Opt(:customButton), Label.RetryButton),
PushButton(Id(:ignore), Opt(:okButton), Label.IgnoreButton)
- )
+ )
if @showLongInfo
UI.OpenDialog(
Opt(:decorated),
layout_popup(message, button_box, true)
- )
+ )
UI.ReplaceWidget(Id(:info), RichText(Opt(:plainText), reason))
else
UI.OpenDialog(
Opt(:decorated),
layout_popup(message, button_box, false)
- )
+ )
UI.ReplaceWidget(Id(:info), Empty())
end
@@ -506,8 +506,8 @@ def DonePackage(error, reason)
Popup.Warning(
_(
"Ignoring a package failure may result in a broken system.\nThe system should be later verified by running the Software Management module."
- )
- )
+ )
+ )
end
return "C" if r == :abort
@@ -556,7 +556,7 @@ def MediaChange(error_code, error, url, product, current, current_label, wanted,
wanted_label,
devices,
current_device
- )
+ )
url_scheme = Ops.get_string(URL.Parse(url), "scheme", "").downcase
@@ -578,7 +578,7 @@ def MediaChange(error_code, error, url, product, current, current_label, wanted,
"If the URL is correct, this indicates that the repository content has changed. To \n" \
"continue using this repository, start Installation Repositories from \n" \
"the YaST control center and refresh the repository.
\n"
- )
+ )
end
if wanted_label == ""
@@ -625,10 +625,10 @@ def MediaChange(error_code, error, url, product, current, current_label, wanted,
"%1\n" \
"%2.\n" \
"Check whether the directory is accessible."
- ),
+ ),
URL.HidePassword(url),
wanted_label
- )
+ )
elsif !is_disc
# report error while accessing network media of product (%1 = URL, %2 = "SuSE Linux ...")
message = Builtins.sformat(
@@ -637,10 +637,10 @@ def MediaChange(error_code, error, url, product, current, current_label, wanted,
"%1\n" \
"%2.\n" \
"Check whether the server is accessible."
- ),
+ ),
URL.HidePassword(url),
wanted_label
- )
+ )
end
# --------------------------------------
@@ -648,7 +648,7 @@ def MediaChange(error_code, error, url, product, current, current_label, wanted,
button_box = ButtonBox(
PushButton(Id(:retry), Opt(:default, :okButton), Label.RetryButton)
- )
+ )
if current == -1 # wrong media id, offer "Ignore"
button_box.params << PushButton(Id(:ignore), Opt(:customButton), Label.IgnoreButton)
@@ -658,7 +658,7 @@ def MediaChange(error_code, error, url, product, current, current_label, wanted,
Id(:cancel),
Opt(:cancelButton),
@autorefreshing ? _("Skip Autorefresh") : Label.AbortButton
- )
+ )
# push button label during media change popup, user can skip
# this media (CD) so no packages from this media will be installed
@@ -688,10 +688,10 @@ def MediaChange(error_code, error, url, product, current, current_label, wanted,
Id(:auto_eject),
_("A&utomatically Eject CD or DVD Medium"),
autoeject
- )
- ),
- button_box
)
+ ),
+ button_box
+ )
end
@doing_eject = false
@@ -703,7 +703,7 @@ def MediaChange(error_code, error, url, product, current, current_label, wanted,
Builtins.contains(
["ftp", "sftp", "http", "https", "nfs", "smb"],
url_scheme
- )
+ )
# this a different file, reset the retry counter
if @retry_url != url
@retry_url = url
@@ -727,14 +727,14 @@ def MediaChange(error_code, error, url, product, current, current_label, wanted,
# failed download will be automatically retried after the timeout, %1 = formatted time (MM:SS format)
Left(Label(Id(:auto_retry), retry_label(@current_retry_timeout))),
button_box
- )
+ )
doing_auto_retry = true
else
Builtins.y2warning(
"Max. autoretry count (%1) reached, giving up...",
RETRY_ATTEMPTS
- )
+ )
end
end
@@ -778,27 +778,27 @@ def MediaChange(error_code, error, url, product, current, current_label, wanted,
Builtins.y2debug(
"Opening Dialog: %1",
layout_popup(message, button_box, true)
- )
+ )
if @showLongInfo
UI.OpenDialog(
Opt(:decorated),
layout_popup(message, button_box, true)
- )
+ )
# TextEntry label
UI.ReplaceWidget(
Id(:info),
VBox(
InputField(Id(:url), Opt(:hstretch), _("&URL")),
RichText(Opt(:plainText), error)
- )
- )
+ )
+ )
UI.ChangeWidget(Id(:url), :Value, url)
else
UI.OpenDialog(
Opt(:decorated),
layout_popup(message, button_box, false)
- )
+ )
UI.ReplaceWidget(Id(:info), Empty())
end
@@ -829,7 +829,7 @@ def MediaChange(error_code, error, url, product, current, current_label, wanted,
Id(:auto_retry),
:Label,
retry_label(@current_retry_timeout)
- )
+ )
end
else
# user has pressed a button, reset the retry counter in the next timeout
@@ -847,8 +847,8 @@ def MediaChange(error_code, error, url, product, current, current_label, wanted,
VBox(
TextEntry(Id(:url), _("&URL")),
RichText(Opt(:plainText), error)
- )
)
+ )
UI.ChangeWidget(Id(:url), :Value, url)
else
UI.ReplaceWidget(Id(:info), Empty())
@@ -913,7 +913,7 @@ def MediaChange(error_code, error, url, product, current, current_label, wanted,
Builtins.y2warning(
"Device %1 not found in the list, using default",
eject_device
- )
+ )
return "E"
end
when :url
@@ -939,8 +939,8 @@ def OpenSourcePopup
HSpacing(MAX_POPUP_TEXT_SIZE),
Heading(Id(:label_source_popup), Opt(:hstretch), " "),
ProgressBar(Id(:progress), " ", 100, 0)
- )
- )
+ )
+ )
end
@_source_open = Ops.add(@_source_open, 1)
@@ -956,7 +956,7 @@ def SetHeaderSourcePopup(text)
if Ops.greater_than(
Builtins.size(text),
Ops.subtract(MAX_POPUP_TEXT_SIZE, ui_adjustment)
- )
+ )
text = process_message(text, Ops.subtract(MAX_POPUP_TEXT_SIZE, ui_adjustment))
end
@@ -973,7 +973,7 @@ def SetLabelSourcePopup(text)
if Ops.greater_than(
Builtins.size(text),
Ops.add(MAX_POPUP_TEXT_SIZE, ui_adjustment)
- )
+ )
text = process_message(text, Ops.add(MAX_POPUP_TEXT_SIZE, ui_adjustment))
end
@@ -1002,7 +1002,7 @@ def CloseSourcePopup
if !IsSourcePopup()
Builtins.y2error(
"The toplevel dialog is not a repository popup dialog!"
- )
+ )
return
end
@@ -1067,7 +1067,7 @@ def SourceCreateError(url, error, description)
URL.HidePassword(url),
error,
description
- )
+ )
# error message - a label followed by a richtext with details
message = _("An error occurred while creating the repository.")
@@ -1114,9 +1114,9 @@ def SourceCreateError(url, error, description)
ButtonBox(
PushButton(Id(:RETRY), Opt(:okButton), Label.RetryButton),
PushButton(Id(:ABORT), Opt(:cancelButton), Label.AbortButton)
- )
- )
)
+ )
+ )
ret = Convert.to_symbol(UI.UserInput)
UI.CloseDialog
Builtins.y2milestone("Source create error: Returning %1", ret)
@@ -1133,7 +1133,7 @@ def SourceCreateEnd(url, error, description)
URL.HidePassword(url),
error,
description
- )
+ )
nil
end
@@ -1152,7 +1152,7 @@ def SourceProbeStart(url)
msg2 = Builtins.sformat(
_("Probing Repository %1"),
URL.HidePassword(url)
- )
+ )
if @_source_open == 1
SetHeaderSourcePopup(msg2)
@@ -1169,7 +1169,7 @@ def SourceProbeFailed(url, type)
"Repository %1 is not %2 repository",
URL.HidePassword(url),
type
- )
+ )
nil
end
@@ -1179,7 +1179,7 @@ def SourceProbeSucceeded(url, type)
"Repository %1 is type %2",
URL.HidePassword(url),
type
- )
+ )
nil
end
@@ -1194,7 +1194,7 @@ def SourceProbeError(url, error, description)
URL.HidePassword(url),
error,
description
- )
+ )
# error message - a label followed by a richtext with details
message = _("Error occurred while probing the repository.")
@@ -1244,9 +1244,9 @@ def SourceProbeError(url, error, description)
ButtonBox(
PushButton(Id(:RETRY), Opt(:okButton), Label.RetryButton),
PushButton(Id(:ABORT), Opt(:cancelButton), Label.AbortButton)
- )
- )
)
+ )
+ )
ret = Convert.to_symbol(UI.UserInput)
UI.CloseDialog
Builtins.y2milestone("Source probe error: Returning %1", ret)
@@ -1262,7 +1262,7 @@ def SourceProbeEnd(url, error, description)
URL.HidePassword(url),
error,
description
- )
+ )
nil
end
@@ -1273,7 +1273,7 @@ def SourceReportStart(source_id, url, task)
source_id,
URL.HidePassword(url),
task
- )
+ )
if Mode.commandline
CommandLine.Print(task)
@@ -1304,7 +1304,7 @@ def SourceReportError(source_id, url, error, description)
URL.HidePassword(url),
error,
description
- )
+ )
# error message - a label followed by a richtext with details
message = Builtins.sformat(_("Repository %1"), url)
@@ -1348,9 +1348,9 @@ def SourceReportError(source_id, url, error, description)
HBox(
PushButton(Id(:RETRY), Opt(:okButton), Label.RetryButton),
PushButton(Id(:ABORT), Opt(:cancelButton), Label.AbortButton)
- )
- )
)
+ )
+ )
ret = Convert.to_symbol(UI.UserInput)
UI.CloseDialog
Builtins.y2milestone("Source report error: Returning %1", ret)
@@ -1366,7 +1366,7 @@ def SourceReportEnd(src_id, url, task, error, description)
task,
error,
description
- )
+ )
# set 100% progress
SourcePopupSetProgress(100)
@@ -1398,8 +1398,8 @@ def StartDeltaProvide(name, archivesize)
_("Downloading delta RPM package %1 (%2)..."),
name,
sz
- )
- )
+ )
+ )
else
UI.CloseDialog if @_provide_popup
# popup heading
@@ -1417,7 +1417,7 @@ def StartDeltaApply(name)
if Mode.commandline
CommandLine.PrintVerbose(
Builtins.sformat(_("Applying delta RPM package %1..."), name)
- )
+ )
else
# popup heading
progressbox = VBox(
@@ -1426,9 +1426,9 @@ def StartDeltaApply(name)
Heading(_("Applying delta RPM package")),
Left(
HBox(Left(Label(Opt(:boldFont), _("Package: "))), Left(Label(name)))
- ),
+ ),
ProgressBar(Id(:progress), "", 100, 0)
- )
+ )
UI.CloseDialog if @_provide_popup
UI.OpenDialog(progressbox)
@_provide_popup = true
@@ -1468,7 +1468,7 @@ def FormatPatchName(patch_name, patch_version, patch_arch)
patch_full_name = Ops.add(
Ops.add(patch_full_name, "-"),
patch_version
- )
+ )
end
if !patch_arch.nil? && patch_arch != ""
@@ -1486,7 +1486,7 @@ def ScriptStart(patch_name, patch_version, patch_arch, script_path)
"ScriptStart callback: patch: %1, script: %2",
patch_full_name,
script_path
- )
+ )
if Mode.commandline
CommandLine.PrintVerbose(
@@ -1494,8 +1494,8 @@ def ScriptStart(patch_name, patch_version, patch_arch, script_path)
_("Starting script %1 (patch %2)..."),
script_path,
patch_full_name
- )
- )
+ )
+ )
else
progressbox = VBox(
HSpacing(60),
@@ -1508,7 +1508,7 @@ def ScriptStart(patch_name, patch_version, patch_arch, script_path)
Label(Opt(:boldFont), _("Patch: ")),
Label(patch_full_name),
HStretch()
- )
+ )
else
Empty()
end,
@@ -1517,8 +1517,8 @@ def ScriptStart(patch_name, patch_version, patch_arch, script_path)
Label(Opt(:boldFont), _("Script: ")),
Label(script_path),
HStretch()
- )
- ),
+ )
+ ),
# label
LogView(Id(:log), _("Output of the Script"), 10, 0),
ButtonBox(
@@ -1526,8 +1526,8 @@ def ScriptStart(patch_name, patch_version, patch_arch, script_path)
Id(:abort),
Opt(:default, :key_F9, :cancelButton),
Label.AbortButton
- )
- )
+ )
+ )
)
UI.CloseDialog if @_script_popup
@@ -1571,7 +1571,7 @@ def ScriptProblem(description)
Label.AbortButton, # no_button_message
Label.IgnoreButton, # retry_button_message
:retry
- )
+ )
Builtins.y2milestone("Problem result: %1", ui)
@@ -1631,20 +1631,20 @@ def AskAbortRefresh
"\n" \
"Note: If the refresh is skipped some packages\n" \
"might be missing or out of date."
- )
- ),
+ )
+ ),
ButtonBox(
PushButton(
Id(:continue),
Opt(:default, :okButton),
Label.ContinueButton
- ),
+ ),
# push button label
PushButton(Id(:skip), Opt(:cancelButton), _("&Skip Refresh"))
- )
)
)
- )
+ )
+ )
UI.SetFocus(Id(:continue))
@@ -1686,15 +1686,15 @@ def InitDownload(task)
HSpacing(1),
ProgressBar(Id(:progress), task, 100),
HSpacing(1)
- ),
+ ),
VSpacing(0.5),
ButtonBox(
PushButton(Id(:abort), Opt(:cancelButton), Label.AbortButton)
- ),
+ ),
VSpacing(0.5)
- )
- )
)
+ )
+ )
UI.ChangeWidget(Id(:progress), :Value, 0)
end
end
@@ -1713,7 +1713,7 @@ def StartDownload(url, localfile)
"Downloading %1 to %2",
URL.HidePassword(url),
localfile
- )
+ )
# reformat the URL
url_report = URL.FormatURL(URL.Parse(URL.HidePassword(url)), MAX_POPUP_TEXT_SIZE)
@@ -1771,7 +1771,7 @@ def ProgressDownload(percent, bps_avg, bps_current)
msg_rate = Builtins.sformat(
_("Downloading: %1"),
String.FormatRateMessage(format, bps_avg, bps_current)
- )
+ )
end
if full_screen
@@ -1824,7 +1824,7 @@ def DoneDownload(error_value, error_text)
"Download failed: error %1: %2",
error_value,
error_text
- )
+ )
end
end
@@ -1878,7 +1878,7 @@ def StartRebuildDB
# message in a progress popup
message = _(
"Rebuilding package database. This process can take some time."
- )
+ )
UI.OpenDialog(
Opt(:decorated),
@@ -1889,9 +1889,9 @@ def StartRebuildDB
HSpacing(60),
HBox(HSpacing(2), ProgressBar(Id(:progress), "", 100), HSpacing(2)),
VSpacing(1)
- )
- )
)
+ )
+ )
UI.ChangeWidget(Id(:progress), :Value, 0)
@@ -1911,8 +1911,8 @@ def StopRebuildDB(error_value, error_text)
Builtins.sformat(
_("Rebuilding of package database failed:\n%1"),
error_text
- )
- )
+ )
+ )
end
UI.CloseDialog
@@ -1928,10 +1928,10 @@ def SetRebuildDBCallbacks
Pkg.CallbackStartRebuildDb(fun_ref(method(:StartRebuildDB), "void ()"))
Pkg.CallbackProgressRebuildDb(
fun_ref(method(:ProgressRebuildDB), "void (integer)")
- )
+ )
Pkg.CallbackStopRebuildDb(
fun_ref(method(:StopRebuildDB), "void (integer, string)")
- )
+ )
Pkg.CallbackNotifyRebuildDb(fun_ref(method(:NotifyRebuildDB), "void ()"))
nil
@@ -1944,7 +1944,7 @@ def StartConvertDB(_unused1)
# message in a progress popup
message = _(
"Converting package database. This process can take some time."
- )
+ )
UI.OpenDialog(
Opt(:decorated),
@@ -1957,11 +1957,11 @@ def StartConvertDB(_unused1)
HSpacing(2),
ProgressBar(Id(:progress), _("Status"), 100),
HSpacing(2)
- ),
+ ),
VSpacing(1)
- )
- )
)
+ )
+ )
UI.ChangeWidget(Id(:progress), :Value, 0)
@@ -1981,8 +1981,8 @@ def StopConvertDB(error_value, error_text)
Builtins.sformat(
_("Conversion of package database failed:\n%1"),
error_text
- )
- )
+ )
+ )
end
UI.CloseDialog
@@ -1997,13 +1997,13 @@ def NotifyConvertDB
def SetConvertDBCallbacks
Pkg.CallbackStartConvertDb(
fun_ref(method(:StartConvertDB), "void (string)")
- )
+ )
Pkg.CallbackProgressConvertDb(
fun_ref(method(:ProgressConvertDB), "void (integer, string)")
- )
+ )
Pkg.CallbackStopConvertDb(
fun_ref(method(:StopConvertDB), "void (integer, string)")
- )
+ )
Pkg.CallbackNotifyConvertDb(fun_ref(method(:NotifyConvertDB), "void ()"))
nil
@@ -2026,7 +2026,7 @@ def StartScanDb
Id(:label_scanDB_popup),
Opt(:hstretch),
_("Reading Installed Packages")
- ),
+ ),
HBox(
# progress bar label
ProgressBar(
@@ -2034,16 +2034,16 @@ def StartScanDb
_("Scanning RPM database..."),
100,
0
- ), # TODO: allow Abort
+ ), # TODO: allow Abort
# ,
# `VBox(
# `Label(""),
# `PushButton(`id(`abort), Label::AbortButton())
# )
HSpacing(1)
- )
)
- )
+ )
+ )
@_scan_popup = true
else
@@ -2081,7 +2081,7 @@ def ErrorScanDb(error, description)
"ErrorScanDb callback: error: %1, description: %2",
error,
description
- )
+ )
# error message, could not read RPM database
message = _("Initialization of the target failed.")
@@ -2113,12 +2113,12 @@ def ErrorScanDb(error, description)
PushButton(Id(:abort), Opt(:cancelButton), Label.AbortButton),
PushButton(Id(:retry), Opt(:customButton), Label.RetryButton),
PushButton(Id(:ignore), Opt(:okButton), Label.IgnoreButton)
- )
+ )
UI.OpenDialog(
Opt(:decorated),
layout_popup(message, button_box, false)
- )
+ )
r = nil
loop do
@@ -2143,9 +2143,9 @@ def ErrorScanDb(error, description)
# detail string is appended to the end
Builtins.sformat(_("Error: %1:"), error_symbol),
description
- )
- )
)
+ )
+ )
else
UI.ReplaceWidget(Id(:info), Empty())
end
@@ -2172,7 +2172,7 @@ def DoneScanDb(error, description)
"RPM DB scan finished: error: %1, reason: '%2'",
error,
description
- )
+ )
if Mode.commandline
# status message (command line mode)
@@ -2217,9 +2217,9 @@ def Authentication(url, msg, username, password)
RichText(
Opt(:plainText),
Builtins.sformat(_("URL: %1\n\n%2"), url, msg)
- ),
- HSpacing(0.1)
),
+ HSpacing(0.1)
+ ),
VSpacing(0.1),
HBox(
HSpacing(1),
@@ -2229,14 +2229,14 @@ def Authentication(url, msg, username, password)
VSpacing(0.1),
# textentry label
Password(Id(:password), Opt(:hstretch), _("&Password"), password)
- ),
- HSpacing(1)
),
+ HSpacing(1)
+ ),
VSpacing(0.5),
ButtonBox(
PushButton(Id(:cont), Opt(:default, :okButton), Label.ContinueButton),
PushButton(Id(:cancel), Opt(:cancelButton), Label.CancelButton)
- ),
+ ),
VSpacing(0.5)
)
@@ -2282,7 +2282,7 @@ def ProgressStart(id, task, in_percent, is_alive, _min, _max, _val_raw, val_perc
@progress_stack = Builtins.add(
@progress_stack,
"type" => subprogress_type, "task" => task
- )
+ )
if IsProgressPopup() &&
Ops.less_or_equal(Builtins.size(@progress_stack), 1)
@@ -2309,12 +2309,12 @@ def ProgressStart(id, task, in_percent, is_alive, _min, _max, _val_raw, val_perc
VSpacing(0.2),
ButtonBox(
PushButton(Id(:abort), Opt(:cancelButton), Label.AbortButton)
- ),
- VSpacing(0.5)
),
+ VSpacing(0.5)
+ ),
HSpacing(1)
- )
- )
+ )
+ )
end
end
@@ -2328,7 +2328,7 @@ def ProgressEnd(id)
@progress_stack = Builtins.remove(
@progress_stack,
Ops.subtract(Builtins.size(@progress_stack), 1)
- )
+ )
if !Mode.commandline && IsProgressPopup()
UI.CloseDialog if Builtins.size(@progress_stack) == 0
@@ -2338,12 +2338,12 @@ def ProgressEnd(id)
@progress_stack,
[Ops.subtract(Builtins.size(@progress_stack), 1), "type"],
:none
- )
+ )
task = Ops.get_string(
@progress_stack,
[Ops.subtract(Builtins.size(@progress_stack), 1), "task"],
""
- )
+ )
Progress.SubprogressType(progress_type, 100)
Progress.SubprogressTitle(task)
@@ -2380,7 +2380,7 @@ def ProgressProgress(id, val_raw, val_percent)
id,
val_percent,
val_raw
- )
+ )
return false
end
elsif full_screen
@@ -2403,12 +2403,12 @@ def ProcessStart(task, stages, help)
task,
stages,
help
- )
+ )
Builtins.y2milestone(
"Progress: status: %1, isrunning: %2",
Progress.status,
Progress.IsRunning
- )
+ )
return if Mode.commandline
@@ -2475,7 +2475,7 @@ def ProcessDone
"Close Wizard window: %1, new stack: %2",
close,
@opened_wizard
- )
+ )
# set 100%
Progress.Finish
@@ -2494,11 +2494,11 @@ def SetMediaCallbacks
fun_ref(
method(:MediaChange),
"string (string, string, string, string, integer, string, integer, string, boolean, list , integer)"
- )
- )
+ )
+ )
Pkg.CallbackSourceChange(
fun_ref(method(:SourceChange), "void (integer, integer)")
- )
+ )
nil
end
@@ -2517,18 +2517,18 @@ def ClearScriptCallbacks
def SetScriptCallbacks
Pkg.CallbackScriptStart(
fun_ref(method(:ScriptStart), "void (string, string, string, string)")
- )
+ )
Pkg.CallbackScriptProgress(
fun_ref(method(:ScriptProgress), "boolean (boolean, string)")
- )
+ )
Pkg.CallbackScriptProblem(
fun_ref(method(:ScriptProblem), "string (string)")
- )
+ )
Pkg.CallbackScriptFinish(fun_ref(method(:ScriptFinish), "void ()"))
Pkg.CallbackMessage(
fun_ref(method(:Message), "boolean (string, string, string, string)")
- )
+ )
nil
end
@@ -2537,13 +2537,13 @@ def SetScanDBCallbacks
Pkg.CallbackStartScanDb(fun_ref(method(:StartScanDb), "void ()"))
Pkg.CallbackProgressScanDb(
fun_ref(method(:ProgressScanDb), "boolean (integer)")
- )
+ )
Pkg.CallbackErrorScanDb(
fun_ref(method(:ErrorScanDb), "string (integer, string)")
- )
+ )
Pkg.CallbackDoneScanDb(
fun_ref(method(:DoneScanDb), "void (integer, string)")
- )
+ )
nil
end
@@ -2561,16 +2561,16 @@ def SetDownloadCallbacks
Pkg.CallbackInitDownload(fun_ref(method(:InitDownload), "void (string)"))
Pkg.CallbackStartDownload(
fun_ref(method(:StartDownload), "void (string, string)")
- )
+ )
Pkg.CallbackProgressDownload(
fun_ref(
method(:ProgressDownload),
"boolean (integer, integer, integer)"
- )
- )
+ )
+ )
Pkg.CallbackDoneDownload(
fun_ref(method(:DoneDownload), "void (integer, string)")
- )
+ )
Pkg.CallbackDestDownload(fun_ref(method(:DestDownload), "void ()"))
Pkg.CallbackStartRefresh(fun_ref(method(:RefreshStarted), "void ()"))
Pkg.CallbackDoneRefresh(fun_ref(method(:RefreshDone), "void ()"))
@@ -2594,22 +2594,22 @@ def SetSourceCreateCallbacks
# source create callbacks
Pkg.CallbackSourceCreateStart(
fun_ref(method(:SourceCreateStart), "void (string)")
- )
+ )
Pkg.CallbackSourceCreateProgress(
fun_ref(method(:SourceCreateProgress), "boolean (integer)")
- )
+ )
Pkg.CallbackSourceCreateError(
fun_ref(method(:SourceCreateError), "symbol (string, symbol, string)")
- )
+ )
Pkg.CallbackSourceCreateEnd(
fun_ref(method(:SourceCreateEnd), "void (string, symbol, string)")
- )
+ )
Pkg.CallbackSourceCreateInit(
fun_ref(method(:SourceCreateInit), "void ()")
- )
+ )
Pkg.CallbackSourceCreateDestroy(
fun_ref(method(:SourceCreateDestroy), "void ()")
- )
+ )
nil
end
@@ -2618,22 +2618,22 @@ def SetSourceProbeCallbacks
# source probing callbacks
Pkg.CallbackSourceProbeStart(
fun_ref(method(:SourceProbeStart), "void (string)")
- )
+ )
Pkg.CallbackSourceProbeFailed(
fun_ref(method(:SourceProbeFailed), "void (string, string)")
- )
+ )
Pkg.CallbackSourceProbeSucceeded(
fun_ref(method(:SourceProbeSucceeded), "void (string, string)")
- )
+ )
Pkg.CallbackSourceProbeProgress(
fun_ref(method(:SourceProbeProgress), "boolean (string, integer)")
- )
+ )
Pkg.CallbackSourceProbeError(
fun_ref(method(:SourceProbeError), "symbol (string, symbol, string)")
- )
+ )
Pkg.CallbackSourceProbeEnd(
fun_ref(method(:SourceProbeEnd), "void (string, symbol, string)")
- )
+ )
nil
end
@@ -2642,13 +2642,13 @@ def SetProcessCallbacks
# register process callbacks (total progress)
Pkg.CallbackProcessStart(
fun_ref(method(:ProcessStart), "void (string, list , string)")
- )
+ )
Pkg.CallbackProcessProgress(
fun_ref(method(:ProcessProgress), "boolean (integer)")
- )
+ )
Pkg.CallbackProcessNextStage(
fun_ref(method(:ProcessNextStage), "void ()")
- )
+ )
Pkg.CallbackProcessDone(fun_ref(method(:ProcessDone), "void ()"))
nil
@@ -2657,25 +2657,25 @@ def SetProcessCallbacks
def SetProvideCallbacks
Pkg.CallbackStartProvide(
fun_ref(method(:StartProvide), "void (string, integer, boolean)")
- )
+ )
Pkg.CallbackProgressProvide(
fun_ref(method(:ProgressProvide), "boolean (integer)")
- )
+ )
Pkg.CallbackDoneProvide(
fun_ref(method(:DoneProvide), "string (integer, string, string)")
- )
+ )
Pkg.CallbackStartPackage(
fun_ref(
method(:StartPackage),
"void (string, string, string, integer, boolean)"
- )
- )
+ )
+ )
Pkg.CallbackProgressPackage(
fun_ref(method(:ProgressPackage), "boolean (integer)")
- )
+ )
Pkg.CallbackDonePackage(
fun_ref(method(:DonePackage), "string (integer, string)")
- )
+ )
nil
end
@@ -2683,29 +2683,29 @@ def SetProvideCallbacks
def SetPatchCallbacks
Pkg.CallbackStartDeltaDownload(
fun_ref(method(:StartDeltaProvide), "void (string, integer)")
- )
+ )
Pkg.CallbackProgressDeltaDownload(
fun_ref(method(:ProgressProvide), "boolean (integer)")
- )
+ )
Pkg.CallbackProblemDeltaDownload(
fun_ref(method(:ProblemDeltaDownload), "void (string)")
- )
+ )
Pkg.CallbackFinishDeltaDownload(
fun_ref(method(:FinishDeltaProvide), "void ()")
- )
+ )
Pkg.CallbackStartDeltaApply(
fun_ref(method(:StartDeltaApply), "void (string)")
- )
+ )
Pkg.CallbackProgressDeltaApply(
fun_ref(method(:ProgressDeltaApply), "void (integer)")
- )
+ )
Pkg.CallbackProblemDeltaApply(
fun_ref(method(:ProblemDeltaApply), "void (string)")
- )
+ )
Pkg.CallbackFinishDeltaApply(
fun_ref(method(:FinishDeltaProvide), "void ()")
- )
+ )
nil
end
@@ -2714,28 +2714,28 @@ def SetSourceReportCallbacks
# source report callbacks
Pkg.CallbackSourceReportStart(
fun_ref(method(:SourceReportStart), "void (integer, string, string)")
- )
+ )
Pkg.CallbackSourceReportProgress(
fun_ref(method(:SourceReportProgress), "boolean (integer)")
- )
+ )
Pkg.CallbackSourceReportError(
fun_ref(
method(:SourceReportError),
"symbol (integer, string, symbol, string)"
- )
- )
+ )
+ )
Pkg.CallbackSourceReportEnd(
fun_ref(
method(:SourceReportEnd),
"void (integer, string, string, symbol, string)"
- )
- )
+ )
+ )
Pkg.CallbackSourceReportInit(
fun_ref(method(:SourceReportInit), "void ()")
- )
+ )
Pkg.CallbackSourceReportDestroy(
fun_ref(method(:SourceReportDestroy), "void ()")
- )
+ )
nil
end
@@ -2745,17 +2745,17 @@ def SetProgressReportCallbacks
fun_ref(
method(:ProgressStart),
"void (integer, string, boolean, boolean, integer, integer, integer, integer)"
- )
- )
+ )
+ )
Pkg.CallbackProgressReportProgress(
fun_ref(
method(:ProgressProgress),
"boolean (integer, integer, integer)"
- )
- )
+ )
+ )
Pkg.CallbackProgressReportEnd(
fun_ref(method(:ProgressEnd), "void (integer)")
- )
+ )
nil
end
@@ -2787,8 +2787,8 @@ def InitPackageCallbacks
fun_ref(
method(:Authentication),
"map (string, string, string, string)"
- )
- )
+ )
+ )
# @see bugzilla #183821
# Do not register these callbacks in case of AutoInstallation
@@ -2799,14 +2799,14 @@ def InitPackageCallbacks
fun_ref(
SignatureCheckCallbacks.method(:AcceptUnsignedFile),
"boolean (string, integer)"
- )
- )
+ )
+ )
Pkg.CallbackAcceptUnknownGpgKey(
fun_ref(
SignatureCheckCallbacks.method(:AcceptUnknownGpgKey),
"boolean (string, string, integer)"
- )
- )
+ )
+ )
# During installation untrusted repositories are disabled to avoid
# asking again
gpg_callback = Stage.initial ? :import_gpg_key_or_disable : :ImportGpgKey
@@ -2814,44 +2814,44 @@ def InitPackageCallbacks
fun_ref(
SignatureCheckCallbacks.method(gpg_callback),
"boolean (map , integer)"
- )
- )
+ )
+ )
Pkg.CallbackAcceptVerificationFailed(
fun_ref(
SignatureCheckCallbacks.method(:AcceptVerificationFailed),
"boolean (string, map , integer)"
- )
- )
+ )
+ )
Pkg.CallbackTrustedKeyAdded(
fun_ref(
SignatureCheckCallbacks.method(:TrustedKeyAdded),
"void (map )"
- )
- )
+ )
+ )
Pkg.CallbackTrustedKeyRemoved(
fun_ref(
SignatureCheckCallbacks.method(:TrustedKeyRemoved),
"void (map )"
- )
- )
+ )
+ )
Pkg.CallbackAcceptFileWithoutChecksum(
fun_ref(
SignatureCheckCallbacks.method(:AcceptFileWithoutChecksum),
"boolean (string)"
- )
- )
+ )
+ )
Pkg.CallbackAcceptWrongDigest(
fun_ref(
SignatureCheckCallbacks.method(:AcceptWrongDigest),
"boolean (string, string, string)"
- )
- )
+ )
+ )
Pkg.CallbackAcceptUnknownDigest(
fun_ref(
SignatureCheckCallbacks.method(:AcceptUnknownDigest),
"boolean (string, string)"
- )
- )
+ )
+ )
end
SetMediaCallbacks()
@@ -3005,7 +3005,7 @@ def layout_popup(message, button_box, info_on)
# "info, "warning", "error"
Icon.Image("warning", "margin_right" => 2),
Left(Label(message))
- ),
+ ),
VSpacing(0.1),
HBox(
HSpacing(0.6),
@@ -3016,16 +3016,16 @@ def layout_popup(message, button_box, info_on)
# check box
_("Show &details"),
info_on
- )
)
- ),
+ )
+ ),
VSpacing(0.4),
HBox(
VSpacing(vertical_size),
HSpacing(0.1),
ReplacePoint(Id(:info), Empty()),
HSpacing(0.1)
- ),
+ ),
HBox(HSpacing(0.1), button_box, HSpacing(0.1)),
VSpacing(0.2)
)
@@ -3081,15 +3081,15 @@ def progress_box(heading, name, sz)
VBox(
Left(Label(Opt(:boldFont), _("Package: "))),
Left(Label(Opt(:boldFont), _("Size: ")))
- ),
+ ),
VBox(Left(Label(name)), Left(Label(sz)))
- )
- ),
+ )
+ ),
ProgressBar(Id(:progress), " ", 100, 0),
ButtonBox(
PushButton(Id(:abort), Opt(:key_F9, :cancelButton), Label.AbortButton)
- )
- )
+ )
+ )
end
def full_screen
diff --git a/library/packages/src/modules/PackageSystem.rb b/library/packages/src/modules/PackageSystem.rb
index 22f607d09..e092b3f73 100644
--- a/library/packages/src/modules/PackageSystem.rb
+++ b/library/packages/src/modules/PackageSystem.rb
@@ -323,7 +323,7 @@ def InitRPMQueryBinary
if Ops.greater_than(
SCR.Read(path(".target.size"), "/usr/bin/rpmqpack"),
-1
- )
+ )
@_rpm_query_binary = "/usr/bin/rpmqpack "
# than rpm itself
elsif Ops.greater_than(SCR.Read(path(".target.size"), "/bin/rpm"), -1)
diff --git a/library/packages/src/modules/PackagesUI.rb b/library/packages/src/modules/PackagesUI.rb
index 1f2cca772..2d0f574d7 100644
--- a/library/packages/src/modules/PackagesUI.rb
+++ b/library/packages/src/modules/PackagesUI.rb
@@ -546,7 +546,7 @@ def InstallationSummary(summary)
if Ops.greater_than(
Builtins.size(Ops.get_list(summary, "remaining", [])),
0
- )
+ )
items = Builtins.add(
items,
Ops.add(
diff --git a/library/packages/src/modules/Product.rb b/library/packages/src/modules/Product.rb
index 0bf35c91d..14ca5b1e2 100644
--- a/library/packages/src/modules/Product.rb
+++ b/library/packages/src/modules/Product.rb
@@ -138,8 +138,8 @@ def ReadProducts
base_product.fetch("display_name",
base_product.fetch("summary",
base_product.fetch("name", "")
- )
- )
+ )
+ )
)
set_property(:short_name, base_product.fetch("short_name", name))
diff --git a/library/packages/src/modules/SignatureCheckCallbacks.rb b/library/packages/src/modules/SignatureCheckCallbacks.rb
index 676efc25f..73955d775 100644
--- a/library/packages/src/modules/SignatureCheckCallbacks.rb
+++ b/library/packages/src/modules/SignatureCheckCallbacks.rb
@@ -68,7 +68,7 @@ def AcceptUnsignedFile(filename, repo_id)
if SignatureCheckDialogs.GetShowThisPopup(
dont_show_dialog_ident,
filename
- )
+ )
return SignatureCheckDialogs.UseUnsignedItem(
:file,
filename,
@@ -105,7 +105,7 @@ def AcceptFileWithoutChecksum(filename)
if SignatureCheckDialogs.GetShowThisPopup(
dont_show_dialog_ident,
filename
- )
+ )
return SignatureCheckDialogs.UseItemWithNoChecksum(
:file,
filename,
@@ -135,7 +135,7 @@ def AcceptWrongDigest(filename, requested_digest, found_digest)
if SignatureCheckDialogs.GetShowThisPopup(
dont_show_dialog_ident,
filename
- )
+ )
return SignatureCheckDialogs.UseFileWithWrongDigest(
filename,
requested_digest,
@@ -167,7 +167,7 @@ def AcceptUnknownDigest(filename, digest)
if SignatureCheckDialogs.GetShowThisPopup(
dont_show_dialog_ident,
filename
- )
+ )
return SignatureCheckDialogs.UseFileWithUnknownDigest(
filename,
digest,
@@ -204,7 +204,7 @@ def AcceptUnknownGpgKey(filename, keyid, repoid)
if SignatureCheckDialogs.GetShowThisPopup(
dont_show_dialog_ident,
filename
- )
+ )
# Unknown keyname == "Unknown Key"
return SignatureCheckDialogs.ItemSignedWithUnknownSignature(
:file,
diff --git a/library/packages/src/modules/SignatureCheckDialogs.rb b/library/packages/src/modules/SignatureCheckDialogs.rb
index 6164a72ea..5e8dfa942 100644
--- a/library/packages/src/modules/SignatureCheckDialogs.rb
+++ b/library/packages/src/modules/SignatureCheckDialogs.rb
@@ -298,7 +298,7 @@ def StringSplitter(whattosplit, delimiter, after_chars)
if Ops.greater_or_equal(
Ops.add(after_chars_counter, after_chars),
max_size
- )
+ )
splittedstring = Ops.add(
Ops.add(splittedstring, splittedstring == "" ? "" : delimiter),
Builtins.substring(whattosplit, after_chars_counter)
@@ -681,7 +681,7 @@ def GPGKeyAsTerm(key)
if Ops.greater_than(
Builtins.size(Ops.get_string(key, "fingerprint", "")),
0
- )
+ )
# GPG key property
rt = Ops.add(
rt,
diff --git a/library/packages/src/modules/SlideShow.rb b/library/packages/src/modules/SlideShow.rb
index 3a949b2a0..1c836e7e7 100644
--- a/library/packages/src/modules/SlideShow.rb
+++ b/library/packages/src/modules/SlideShow.rb
@@ -975,7 +975,7 @@ def Setup(stages)
if Ops.greater_than(
Ops.add(Ops.get_integer(stage, "size", 0), start),
100
- )
+ )
Ops.set(stage, "size", Ops.subtract(100, start))
end
diff --git a/library/packages/test/product_test.rb b/library/packages/test/product_test.rb
index 593d7df6b..cc72dc398 100755
--- a/library/packages/test/product_test.rb
+++ b/library/packages/test/product_test.rb
@@ -185,7 +185,7 @@ def stub_defaults
it "reads data from zypp and returns hash of release notes URLs linking to their product names" do
expect(Yast::Product.product_of_relnotes).to eq(
"http://doc.opensuse.org/release-notes/x86_64/openSUSE/13.1/release-notes-openSUSE.rpm" => "openSUSE (SELECTED)"
- )
+ )
end
end
@@ -266,7 +266,7 @@ def stub_defaults
it "reads data from zypp and returns hash of release notes URLs linking to their product names" do
expect(Yast::Product.product_of_relnotes).to eq(
"http://doc.opensuse.org/release-notes/x86_64/openSUSE/13.1/release-notes-openSUSE.rpm" => "openSUSE (INSTALLED)"
- )
+ )
end
end
diff --git a/library/system/src/lib/yast2/fs_snapshot.rb b/library/system/src/lib/yast2/fs_snapshot.rb
index 2bbe07772..4a3c9242b 100644
--- a/library/system/src/lib/yast2/fs_snapshot.rb
+++ b/library/system/src/lib/yast2/fs_snapshot.rb
@@ -183,7 +183,7 @@ def self.create(snapshot_type, description, previous: nil, cleanup: nil, importa
root: target_root,
snapshot_type: snapshot_type,
description: description
- )
+ )
cmd << " --pre-num #{previous.number}" if previous
cmd << " --userdata \"important=yes\"" if important
diff --git a/library/system/src/modules/FileChanges.rb b/library/system/src/modules/FileChanges.rb
index 8877f266f..a798eb931 100644
--- a/library/system/src/modules/FileChanges.rb
+++ b/library/system/src/modules/FileChanges.rb
@@ -69,7 +69,7 @@ def ReadSettings
if Ops.less_or_equal(
Convert.to_integer(SCR.Read(path(".target.size"), @data_file)),
0
- )
+ )
@file_checksums = {}
return
end
diff --git a/library/system/src/modules/Initrd.rb b/library/system/src/modules/Initrd.rb
index 47f912c98..dfb55be4e 100644
--- a/library/system/src/modules/Initrd.rb
+++ b/library/system/src/modules/Initrd.rb
@@ -404,7 +404,7 @@ def Write
@additional_parameters,
Ops.add(Directory.logdir, "/y2logmkinitrd")
)
- ) != 0
+ ) != 0
log = Convert.to_string(
SCR.Read(
path(".target.string"),
diff --git a/library/system/src/modules/ModuleLoading.rb b/library/system/src/modules/ModuleLoading.rb
index 4b1b48cb2..772a923ef 100644
--- a/library/system/src/modules/ModuleLoading.rb
+++ b/library/system/src/modules/ModuleLoading.rb
@@ -136,7 +136,7 @@ def Load(modulename, moduleargs, vendorname, devicename, ask_before_loading, wit
if Ops.greater_than(
Builtins.size(Ops.get_map(loaded_modules, modulename, {})),
0
- )
+ )
# already loaded
return :ok
end
diff --git a/library/systemd/test/test_helper.rb b/library/systemd/test/test_helper.rb
index c14c48245..7a9985393 100644
--- a/library/systemd/test/test_helper.rb
+++ b/library/systemd/test/test_helper.rb
@@ -39,7 +39,7 @@ def stub_socket_unit_files
dbus.socket static
dm-event.socket disabled
LIST
- )
+ )
end
def stub_service_unit_files
@@ -51,7 +51,7 @@ def stub_service_unit_files
sssd.service enabled
startpreload.service masked
LIST
- )
+ )
end
def stub_target_unit_files
@@ -65,7 +65,7 @@ def stub_target_unit_files
kexec.target disabled
multi-user.target disabled
LIST
- )
+ )
end
def stub_service_units
@@ -77,7 +77,7 @@ def stub_service_units
sssd.service loaded active running System Security Services Daemon
SuSEfirewall2.service loaded inactive dead SuSEfirewall2 phase 2
LIST
- )
+ )
end
def stub_socket_units
@@ -90,7 +90,7 @@ def stub_socket_units
lvm2-lvmetad.socket loaded inactive dead LVM2 metadata daemon socket
pcscd.socket loaded active listening PC/SC Smart Card Daemon Activation Socket
LIST
- )
+ )
end
def stub_target_units
@@ -104,7 +104,7 @@ def stub_target_units
network.target loaded active active Network
nss-lookup.target loaded active active Host and Network Name Lookups
LIST
- )
+ )
end
end
@@ -130,7 +130,7 @@ def load_socket_properties(socket_name)
stdout: File.read(File.join(__dir__, "data", "#{socket_name}_socket_properties")),
stderr: "",
exit: 0
- )
+ )
end
def stub_sockets(socket: "iscsid")
@@ -161,7 +161,7 @@ def load_service_properties(service_name)
stdout: File.read(File.join(__dir__, "data", "#{service_name}_service_properties")),
stderr: "",
exit: 0
- )
+ )
end
end
@@ -183,6 +183,6 @@ def load_target_properties(target_name)
stdout: File.read(File.join(__dir__, "data", "#{target_name}_target_properties")),
stderr: "",
exit: 0
- )
+ )
end
end
diff --git a/library/types/src/modules/Punycode.rb b/library/types/src/modules/Punycode.rb
index c0ff51945..65673d15f 100644
--- a/library/types/src/modules/Punycode.rb
+++ b/library/types/src/modules/Punycode.rb
@@ -100,7 +100,7 @@ def CreateNewCacheRecord(decoded, encoded)
if Ops.greater_than(
Ops.add(Ops.add(@current_cache_size, decoded_size), encoded_size),
@maximum_cache_size
- )
+ )
return
end
@@ -228,7 +228,7 @@ def ConvertBackAndForth(strings_in, to_punycode)
if Convert.to_integer(
SCR.Execute(path(".target.bash"), convert_command)
- ) != 0
+ ) != 0
Builtins.y2error("Conversion failed!")
else
converted_not_cached = Convert.convert(
diff --git a/library/types/src/modules/URL.rb b/library/types/src/modules/URL.rb
index 3b691ff86..58eb8cefe 100644
--- a/library/types/src/modules/URL.rb
+++ b/library/types/src/modules/URL.rb
@@ -298,7 +298,7 @@ def Check(url)
if !Builtins.regexpmatch(
Ops.get_string(tokens, "scheme", ""),
"^[[:alpha:]]*$"
- )
+ )
return false
end
@@ -342,7 +342,7 @@ def Build(tokens)
if Builtins.regexpmatch(
Ops.get_string(tokens, "scheme", ""),
"^[[:alpha:]]*$"
- )
+ )
# if (tokens["scheme"]:"" == "samba") url="smb";
# else
url = Ops.get_string(tokens, "scheme", "")
diff --git a/library/wizard/src/modules/Confirm.rb b/library/wizard/src/modules/Confirm.rb
index 4d49b9b91..549b4600e 100644
--- a/library/wizard/src/modules/Confirm.rb
+++ b/library/wizard/src/modules/Confirm.rb
@@ -165,7 +165,7 @@ def MustBeRoot
if Ops.less_or_equal(
Convert.to_integer(SCR.Read(path(".target.size"), "/usr/bin/id")),
0
- )
+ )
if !Stage.initial
Builtins.y2warning("/usr/bin/id not existing, supposing to be root")
end