Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
rubocop: enable and fix "Style/MultilineOperationIndentation"
  • Loading branch information
lslezak committed Nov 26, 2014
1 parent c6903ac commit 3cbfa31
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 33 deletions.
4 changes: 0 additions & 4 deletions .rubocop.yml
Expand Up @@ -51,10 +51,6 @@ Style/CaseIndentation:
Style/Documentation:
Enabled: false

# no extra indentation for multiline operations
Style/MultilineOperationIndentation:
Enabled: false

# disabled, unless should be used only in trailing form
Style/NegatedIf:
Enabled: false
Expand Down
2 changes: 1 addition & 1 deletion src/clients/inst_scc.rb
Expand Up @@ -122,7 +122,7 @@ def register_base_system

# do not re-register during installation
if !Mode.normal && ::Registration::Registration.is_registered? &&
options.base_registered
options.base_registered

return :next
end
Expand Down
2 changes: 1 addition & 1 deletion src/lib/registration/connect_helpers.rb
Expand Up @@ -100,7 +100,7 @@ def self.catch_registration_errors(message_prefix: "", show_update_hint: false,
"%s to speed up the synchronization process.\n" \
"Just wait several minutes after logging in and then retry \n" \
"the upgrade again.") % \
SUSE::Connect::Client::DEFAULT_URL
SUSE::Connect::Client::DEFAULT_URL
end

# add the hint to the error details
Expand Down
6 changes: 3 additions & 3 deletions src/lib/registration/registration.rb
Expand Up @@ -133,9 +133,9 @@ def self.is_registered?
def set_registered(remote_product)
addon = Addon.find_all(self).find do |a|
a.arch == remote_product.arch &&
a.identifier == remote_product.identifier &&
a.version == remote_product.version &&
a.release_type == remote_product.release_type
a.identifier == remote_product.identifier &&
a.version == remote_product.version &&
a.release_type == remote_product.release_type
end

return unless addon
Expand Down
14 changes: 7 additions & 7 deletions src/lib/registration/ssl_certificate_details.rb
Expand Up @@ -32,9 +32,9 @@ def issuer

def summary(small_space: false)
summary = _("Certificate:") + "\n" + _("Issued To") + "\n" + subject +
"\n" + _("Issued By") + "\n" + issuer + "\n" + _("SHA1 Fingerprint: ") +
"\n" + INDENT + certificate.fingerprint(Fingerprint::SHA1).value + "\n" +
_("SHA256 Fingerprint: ") + "\n"
"\n" + _("Issued By") + "\n" + issuer + "\n" + _("SHA1 Fingerprint: ") +
"\n" + INDENT + certificate.fingerprint(Fingerprint::SHA1).value + "\n" +
_("SHA256 Fingerprint: ") + "\n"

sha256 = certificate.fingerprint(Fingerprint::SHA256).value
if small_space
Expand All @@ -58,10 +58,10 @@ def richtext_summary
def identity_details(cn, o, ou)
# label followed by the SSL certificate identification
_("Common Name (CN): ") + (cn || "") + "\n" +
# label followed by the SSL certificate identification
_("Organization (O): ") + (o || "") + "\n" +
# label followed by the SSL certificate identification
_("Organization Unit (OU): ") + (ou || "") + "\n"
# label followed by the SSL certificate identification
_("Organization (O): ") + (o || "") + "\n" +
# label followed by the SSL certificate identification
_("Organization Unit (OU): ") + (ou || "") + "\n"
end
end
end
34 changes: 17 additions & 17 deletions src/lib/registration/ui/import_certificate_dialog.rb
Expand Up @@ -116,23 +116,23 @@ def warning_text
_("<p>Secure connection (HTTPS) uses SSL certificates for verifying the " \
"authenticity of the server and for encrypting the transferred data.</p>") +

# help text (RichText) for importing a SSL certificate (2/5)
_("<p>You can choose to import the certificate it into the list of known " \
"certificate autohorities (CA), meaning that you trust the subject " \
"and the issuer of the unknown certificate.</p>") +

# help text (RichText) for importing a SSL certificate (3/5)
_("<p>Importing a certificate will allow to use for example a " \
"self-signed certificate.</p>") +

# help text (RichText) for importing a SSL certificate (4/5)
_("<p><b>Important:</b> You should verify the fingerprint of the " \
"certificate to be sure you import the genuine certificate from " \
"the requested server.</p>") +

# help text (RichText) for importing a SSL certificate (5/5)
_("<p><b>Importing an unknown certificate without " \
"verification is a big security risk.</b></p>")
# help text (RichText) for importing a SSL certificate (2/5)
_("<p>You can choose to import the certificate it into the list of known " \
"certificate autohorities (CA), meaning that you trust the subject " \
"and the issuer of the unknown certificate.</p>") +

# help text (RichText) for importing a SSL certificate (3/5)
_("<p>Importing a certificate will allow to use for example a " \
"self-signed certificate.</p>") +

# help text (RichText) for importing a SSL certificate (4/5)
_("<p><b>Important:</b> You should verify the fingerprint of the " \
"certificate to be sure you import the genuine certificate from " \
"the requested server.</p>") +

# help text (RichText) for importing a SSL certificate (5/5)
_("<p><b>Importing an unknown certificate without " \
"verification is a big security risk.</b></p>")
end
end
end
Expand Down

0 comments on commit 3cbfa31

Please sign in to comment.