[PATCH] Fix a format parameter mapping (#1007472)

[David Shea]

---
 pyanaconda/ui/gui/spokes/custom.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 393e52a..03e0cdc 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -1242,7 +1242,9 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             min_disks = mdraid.get_raid_min_members(md_level)
             if len(self._device_disks) < min_disks:
                 error = (_(raid_level_not_enough_disks_msg)
-                         % (raid_level, min_disks, len(self._device_disks)))
+                         % {"level": raid_level,
+                            "min" : min_disks,
+                            "count": len(self._device_disks)})

if error:
             self.set_warning(error)

[Chris Lumens]

> diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
> index 393e52a..03e0cdc 100644
> --- a/pyanaconda/ui/gui/spokes/custom.py
> +++ b/pyanaconda/ui/gui/spokes/custom.py
> @@ -1242,7 +1242,9 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
>              min_disks = mdraid.get_raid_min_members(md_level)
>              if len(self._device_disks) < min_disks:
>                  error = (_(raid_level_not_enough_disks_msg)
>                     % (raid_level, min_disks, len(self._device_disks)))
>                     % {"level": raid_level,
>                        "min" : min_disks,
>                        "count": len(self._device_disks)})
>
>    if error:
>        self.set_warning(error)

ACK.

Incidentally, I think the extra layer of parens to avoid having a
backslash is silly.

- Chris

[David Shea]

On 09/12/2013 11:01 AM, Chris Lumens wrote:
> > diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
> > index 393e52a..03e0cdc 100644
> > --- a/pyanaconda/ui/gui/spokes/custom.py
> > +++ b/pyanaconda/ui/gui/spokes/custom.py
> > @@ -1242,7 +1242,9 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
> >               min_disks = mdraid.get_raid_min_members(md_level)
> >               if len(self._device_disks) < min_disks:
> >                   error = (_(raid_level_not_enough_disks_msg)
> >                     % (raid_level, min_disks, len(self._device_disks)))
> >                     % {"level": raid_level,
> >                        "min" : min_disks,
> >                        "count": len(self._device_disks)})
> >
> >     if error:
> >         self.set_warning(error)
>
> ACK.
>
> Incidentally, I think the extra layer of parens to avoid having a
> backslash is silly.

Fair enough, removed 'em