Merge branch 'master' into show-config

agama-project · Oct 30, 2024 · 7e8bcbe · 7e8bcbe
2 parents 29b7cf6 + b0d9d1b
commit 7e8bcbe
Show file tree

Hide file tree

Showing 89 changed files with 6,163 additions and 5,037 deletions.
diff --git a/.github/workflows/weblate-merge-po.yml b/.github/workflows/weblate-merge-po.yml
@@ -16,7 +16,7 @@ jobs:
       pull-requests: write
 
     # do not run in forks
-    if: !github.event.repository.fork
+    if: ${{ !github.event.repository.fork }}
 
     runs-on: ubuntu-latest
 

diff --git a/.github/workflows/weblate-merge-products-po.yml b/.github/workflows/weblate-merge-products-po.yml
@@ -16,7 +16,7 @@ jobs:
       pull-requests: write
 
     # do not run in forks
-    if: !github.event.repository.fork
+    if: ${{ !github.event.repository.fork }}
 
     runs-on: ubuntu-latest
 

diff --git a/.github/workflows/weblate-merge-service-po.yml b/.github/workflows/weblate-merge-service-po.yml
@@ -16,7 +16,7 @@ jobs:
       pull-requests: write
 
     # do not run in forks
-    if: !github.event.repository.fork
+    if: ${{ !github.event.repository.fork }}
 
     runs-on: ubuntu-latest
 

diff --git a/.github/workflows/weblate-update-pot.yml b/.github/workflows/weblate-update-pot.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   update-pot:
     # do not run in forks
-    if: !github.event.repository.fork
+    if: ${{ !github.event.repository.fork }}
 
     runs-on: ubuntu-latest
 

diff --git a/products.d/leap_160.yaml b/products.d/leap_160.yaml
@@ -17,8 +17,8 @@ translations:
       Enterprise Serveru.
     de: Leap 16.0 ist die neueste Version einer Community-Distribution, die auf dem
       aktuellen SUSE Linux Enterprise Server basiert.
-    es: Leap 16.0 es la última versión de una distribución comunitaria basada en el
-      último SUSE Linux Enterprise Server.
+    es: La última versión de una distribución comunitaria basada en el último SUSE
+      Linux Enterprise Server.
     ja: 最新のSUSE Linux Enterprise Server をベースにした、コミュニティディストリビューションの最新版です。
     nb_NO: Leap 16.0 er den nyeste versjonen av den fellesskapte distribusjon basert
       på den nyeste SUSE Linux Enterprise Server.

diff --git a/products.d/sles_160.yaml b/products.d/sles_160.yaml
@@ -23,12 +23,11 @@ translations:
       přizpůsobivý operační systém pro dlouhodobě podporovanou infrastrukturu
       připravenou na inovace, na které běží kritické podnikové úlohy v lokálním
       prostředí, v cloudu i na okraji sítě.
-    es: SUSE Linux Enterprise Server es la opción de servidor Linux abierta,
-      confiable, compatible y preparada para el futuro que garantiza la
-      continuidad del negocio de la empresa. Es el sistema operativo seguro y
-      adaptable para una infraestructura lista para la innovación y con soporte
-      a largo plazo que ejecuta cargas de trabajo críticas para el negocio en
-      las instalaciones, en la nube y en el borde.
+    es: Una opción de servidor Linux abierta, confiable, compatible y preparada para
+      el futuro que garantiza la continuidad del negocio de la empresa. Es el
+      sistema operativo seguro y adaptable para una infraestructura lista para
+      la innovación y con soporte a largo plazo que ejecuta cargas de trabajo
+      críticas para el negocio en las instalaciones, en la nube y en el borde.
     ja: オープンで信頼性が高く、各種の標準にも準拠し、将来性とビジネスの継続性を支援する Linux
       サーバです。長期のサポートが提供されていることから、安全性と順応性に優れ、オンプレミスからクラウド、エッジ環境に至るまで、様々な場所で重要なビジネス処理をこなすことのできる革新性の高いインフラストラクチャです。
     pt_BR: Uma escolha de servidor Linux aberta, confiável, compatível e à prova do

diff --git a/products.d/slowroll.yaml b/products.d/slowroll.yaml
@@ -6,13 +6,13 @@ archs: x86_64
 # at the at translations/description key below to avoid using obsolete
 # translations!!
 # ------------------------------------------------------------------------------
-description:
-  'An experimental and slightly slower rolling release of openSUSE designed
-  to update less often than Tumbleweed but more often than Leap without forcing users
-  to choose between "stable" and newer packages.'
+description: 'An experimental and slightly slower rolling release of openSUSE
+  designed to update less often than Tumbleweed but more often than Leap without
+  forcing users to choose between "stable" and newer packages.'
 icon: Slowroll.svg
 # Do not manually change any translations! See README.md for more details.
 translations:
+  description: {}
 software:
   installation_repositories:
     - url: https://download.opensuse.org/slowroll/repo/oss/

diff --git a/products.d/tumbleweed.yaml b/products.d/tumbleweed.yaml
@@ -24,11 +24,10 @@ translations:
       gesamten Software enthält, anstatt sich auf starre periodische
       Veröffentlichungszyklen zu verlassen. Das Projekt tut dies für Benutzer,
       die die neueste, stabile Software wünschen.
-    es: La distribución Tumbleweed es una versión pura de lanzamiento continuo de
-      openSUSE que contiene las últimas versiones "estables" de todo el software
-      en lugar de depender de ciclos de lanzamiento periódicos menos flexibles.
-      El proyecto hace esto para usuarios que desean el software estable más
-      nuevo.
+    es: Una versión puramente continua de openSUSE que contiene las últimas
+      versiones "estables" de todo el software en lugar de depender de rígidos
+      ciclos de lanzamiento periódicos. El proyecto hace esto para usuarios que
+      desean el software estable más novedoso.
     fr: La distribution Tumbleweed est une pure "rolling release" (publication
       continue) d'openSUSE contenant les dernières versions "stables" de tous
       les logiciels au lieu de se baser sur des cycles de publication

diff --git a/service/lib/agama/storage/config_conversions.rb b/service/lib/agama/storage/config_conversions.rb
@@ -26,9 +26,6 @@ module Agama
   module Storage
     # Conversions for the storage config.
     module ConfigConversions
-      # Reserved string for Configs::Search meaning 'match all devices if there is any'
-      SEARCH_ANYTHING_STRING = "*"
-      private_constant :SEARCH_ANYTHING_STRING
     end
   end
 end
diff --git a/service/lib/agama/storage/config_conversions/from_json_conversions/search.rb b/service/lib/agama/storage/config_conversions/from_json_conversions/search.rb
@@ -36,6 +36,12 @@ def convert
 
         private
 
+          # Reserved search value meaning 'match all devices or ignore the section'.
+          #
+          # { search: "*" } is a shortcut for { search: { ifNotFound: "skip" } }.
+          SEARCH_ANYTHING_STRING = "*"
+          private_constant :SEARCH_ANYTHING_STRING
+
           alias_method :search_json, :config_json
 
           # @see Base#conversions

diff --git a/service/lib/agama/storage/config_conversions/to_json_conversions/search.rb b/service/lib/agama/storage/config_conversions/to_json_conversions/search.rb
@@ -33,13 +33,6 @@ def self.config_type
             Configs::Search
           end
 
-          # @see Base#convert
-          def convert
-            return SEARCH_ANYTHING_STRING if config.all_if_any?
-
-            super
-          end
-
         private
 
           # @see Base#conversions

diff --git a/service/lib/agama/storage/configs/search.rb b/service/lib/agama/storage/configs/search.rb
@@ -71,13 +71,6 @@ def always_match?
           name.nil?
         end
 
-        # Whether the search matches all the available devices, skipping if none is found
-        #
-        # @return [Boolean]
-        def all_if_any?
-          always_match? && max.nil? && if_not_found == :skip
-        end
-
         # Whether the section containing the search should be skipped
         #
         # @return [Boolean]

diff --git a/service/package/rubygem-agama-yast.changes b/service/package/rubygem-agama-yast.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Oct 30 11:33:54 UTC 2024 - José Iván López González <jlopez@suse.com>
+
+- Storage: do not generate config json with search wildcard
+  (gh#agama-project/agama#1713).
+- Storage: fix issue when setting config
+  (gh#agama-project/agama#1706).
+
 -------------------------------------------------------------------
 Mon Oct 28 15:30:25 UTC 2024 - Ancor Gonzalez Sosa <ancor@suse.com>
 
@@ -33,7 +41,7 @@ Wed Oct 16 15:09:31 UTC 2024 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 
 - Add support for running user-defined scripts after the
   installation (gh#agama-project/agama#1673).
-  
+
 -------------------------------------------------------------------
 Wed Oct 16 14:35:47 UTC 2024 - José Iván López González <jlopez@suse.com>
 

diff --git a/service/po/ca.po b/service/po/ca.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-18 02:35+0000\n"
+"POT-Creation-Date: 2024-10-29 09:01+0000\n"
 "PO-Revision-Date: 2024-09-18 10:48+0000\n"
 "Last-Translator: David Medina <medipas@gmail.com>\n"
-"Language-Team: Catalan <https://l10n.opensuse.org/projects/agama/"
-"agama-service-master/ca/>\n"
+"Language-Team: Catalan <https://l10n.opensuse.org/projects/agama/agama-"
+"service-master/ca/>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,34 +20,34 @@ msgstr ""
 "X-Generator: Weblate 5.7.2\n"
 
 #. Runs the startup phase
-#: service/lib/agama/manager.rb:88
+#: service/lib/agama/manager.rb:91
 msgid "Load software translations"
 msgstr "Carrega les traduccions del programari"
 
-#: service/lib/agama/manager.rb:89
+#: service/lib/agama/manager.rb:92
 msgid "Load storage translations"
 msgstr "Carrega les traduccions de l'emmagatzematge"
 
 #. Runs the config phase
-#: service/lib/agama/manager.rb:104
+#: service/lib/agama/manager.rb:107
 msgid "Analyze disks"
 msgstr "Anàlisi dels discs"
 
-#: service/lib/agama/manager.rb:104
+#: service/lib/agama/manager.rb:107
 msgid "Configure software"
 msgstr "Configuració del programari"
 
 #. Runs the install phase
 #. rubocop:disable Metrics/AbcSize
-#: service/lib/agama/manager.rb:124
+#: service/lib/agama/manager.rb:127
 msgid "Prepare disks"
 msgstr "Preparació dels discs"
 
-#: service/lib/agama/manager.rb:125
+#: service/lib/agama/manager.rb:128
 msgid "Install software"
 msgstr "Instal·lació de programari"
 
-#: service/lib/agama/manager.rb:126
+#: service/lib/agama/manager.rb:129
 msgid "Configure the system"
 msgstr "Configuració del sistema"
 
@@ -132,21 +132,34 @@ msgstr "El producte ha d'estar registrat."
 msgid "Found %s dependency issues."
 msgstr "S'han trobat %s problemes de dependències."
 
-#. TRANSLATORS: %s is the replaced by a device alias (e.g., "pv1").
-#: service/lib/agama/storage/config_checker.rb:112
-#, c-format
-msgid "There is no LVM thin pool volume with alias %s"
-msgstr "No hi ha cap volum d'agrupació prim d'LVM amb l'àlies %s."
+#. Issue for not found device.
+#.
+#. @param config [Configs::Drive, Configs::Partition]
+#. @return [Agama::Issue]
+#: service/lib/agama/storage/config_checker.rb:87
+msgid "No device found for a mandatory drive"
+msgstr "No s'ha trobat cap dispositiu per a una unitat obligatòria."
 
-#. TRANSLATORS: %s is the replaced by a device alias (e.g., "pv1").
-#: service/lib/agama/storage/config_checker.rb:129
+#: service/lib/agama/storage/config_checker.rb:89
+msgid "No device found for a mandatory partition"
+msgstr "No s'ha trobat cap dispositiu per a una partició obligatòria."
+
+#. TRANSLATORS: %s is the replaced by a mount path (e.g., "/home").
+#: service/lib/agama/storage/config_checker.rb:118
 #, c-format
-msgid "There is no LVM physical volume with alias %s"
-msgstr "No hi ha cap volum físic d'LVM amb l'àlies %s."
+msgid "Missing file system type for '%s'"
+msgstr ""
+
+#. TRANSLATORS: %{filesystem} is replaced by a file system type (e.g., "Btrfs") and
+#. %{path} is replaced by a mount path (e.g., "/home").
+#: service/lib/agama/storage/config_checker.rb:145
+#, perl-brace-format
+msgid "The file system type '%{filesystem}' is not suitable for '%{path}'"
+msgstr ""
 
 #. TRANSLATORS: 'crypt_method' is the identifier of the method to encrypt the device
 #. (e.g., 'luks1', 'random_swap').
-#: service/lib/agama/storage/config_checker.rb:160
+#: service/lib/agama/storage/config_checker.rb:178
 #, perl-brace-format
 msgid ""
 "No passphrase provided (required for using the method '%{crypt_method}')."
@@ -156,21 +169,56 @@ msgstr ""
 
 #. TRANSLATORS: 'crypt_method' is the identifier of the method to encrypt the device
 #. (e.g., 'luks1', 'random_swap').
-#: service/lib/agama/storage/config_checker.rb:178
+#: service/lib/agama/storage/config_checker.rb:196
 #, perl-brace-format
 msgid "Encryption method '%{crypt_method}' is not available in this system."
 msgstr ""
 "El mètode d'encriptació %{crypt_method} no està disponible en aquest sistema."
 
 #. TRANSLATORS: 'crypt_method' is the identifier of the method to encrypt the device
 #. (e.g., 'luks1', 'random_swap').
-#: service/lib/agama/storage/config_checker.rb:197
+#: service/lib/agama/storage/config_checker.rb:226
 #, perl-brace-format
 msgid "'%{crypt_method}' is not a suitable method to encrypt the device."
 msgstr ""
 "El mètode %{crypt_method} no és un mètode adequat per encriptar el "
 "dispositiu."
 
+#. TRANSLATORS: %s is the replaced by a device alias (e.g., "disk1").
+#: service/lib/agama/storage/config_checker.rb:276
+#, c-format
+msgid ""
+"The device '%s' is used several times as target device for physical volumes"
+msgstr ""
+
+#. TRANSLATORS: %s is the replaced by a device alias (e.g., "pv1").
+#: service/lib/agama/storage/config_checker.rb:350
+#, fuzzy, c-format
+msgid "There is no LVM thin pool volume with alias '%s'"
+msgstr "No hi ha cap volum d'agrupació prim d'LVM amb l'àlies %s."
+
+#. TRANSLATORS: %s is the replaced by a device alias (e.g., "pv1").
+#: service/lib/agama/storage/config_checker.rb:375
+#, fuzzy, c-format
+msgid "There is no LVM physical volume with alias '%s'"
+msgstr "No hi ha cap volum físic d'LVM amb l'àlies %s."
+
+#. TRANSLATORS: %s is the replaced by a device alias (e.g., "disk1").
+#: service/lib/agama/storage/config_checker.rb:401
+#, fuzzy, c-format
+msgid "There is no target device for LVM physical volumes with alias '%s'"
+msgstr "No hi ha cap volum físic d'LVM amb l'àlies %s."
+
+#. TRANSLATORS: 'crypt_method' is the identifier of the method to encrypt the device
+#. (e.g., 'luks1').
+#: service/lib/agama/storage/config_checker.rb:434
+#, fuzzy, perl-brace-format
+msgid ""
+"'%{crypt_method}' is not a suitable method to encrypt the physical volumes."
+msgstr ""
+"El mètode %{crypt_method} no és un mètode adequat per encriptar el "
+"dispositiu."
+
 #. Text of the reason preventing to shrink because there is no content.
 #.
 #. @return [String, nil] nil if there is content or there is any other reasons.
@@ -230,7 +278,7 @@ msgstr "Escrivint la configuració de sistema del carregador d'arrencada"
 #. Issue representing the proposal is not valid.
 #.
 #. @return [Issue]
-#: service/lib/agama/storage/proposal.rb:283
+#: service/lib/agama/storage/proposal.rb:287
 msgid "Cannot accommodate the required file systems for installation"
 msgstr ""
 "No es poden acomodar els sistemes de fitxers necessaris per a la "
@@ -239,7 +287,7 @@ msgstr ""
 #. Issue to communicate a generic Y2Storage error.
 #.
 #. @return [Issue]
-#: service/lib/agama/storage/proposal.rb:294
+#: service/lib/agama/storage/proposal.rb:298
 msgid "A problem ocurred while calculating the storage setup"
 msgstr ""
 "Hi ha hagut un problema en calcular la configuració de l'emmagatzematge."
@@ -265,29 +313,18 @@ msgstr[1] ""
 "Els dispositius seleccionats següents no es troben al sistema: %{devices}"
 
 #. Recalculates the list of issues
-#: service/lib/agama/users.rb:152
+#: service/lib/agama/users.rb:148
 msgid ""
 "Defining a user, setting the root password or a SSH public key is required"
 msgstr ""
 "Cal definir un usuari, establir la contrasenya d'arrel o una clau pública "
 "SSH."
 
-#. @see #not_found_issue
-#: service/lib/y2storage/proposal/agama_searcher.rb:158
-msgid "No device found for an optional drive"
-msgstr "No s'ha trobat cap dispositiu per a una unitat opcional."
-
-#: service/lib/y2storage/proposal/agama_searcher.rb:160
-msgid "No device found for a mandatory drive"
-msgstr "No s'ha trobat cap dispositiu per a una unitat obligatòria."
-
-#: service/lib/y2storage/proposal/agama_searcher.rb:163
-msgid "No device found for an optional partition"
-msgstr "No s'ha trobat cap dispositiu per a una partició opcional."
+#~ msgid "No device found for an optional drive"
+#~ msgstr "No s'ha trobat cap dispositiu per a una unitat opcional."
 
-#: service/lib/y2storage/proposal/agama_searcher.rb:165
-msgid "No device found for a mandatory partition"
-msgstr "No s'ha trobat cap dispositiu per a una partició obligatòria."
+#~ msgid "No device found for an optional partition"
+#~ msgstr "No s'ha trobat cap dispositiu per a una partició opcional."
 
 #~ msgid "Probing Storage"
 #~ msgstr "Sondant l'emmagatzematge"