[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH f17-branch] The createSuggested methods have changed name (#791204, #795058).



On Mon, 2012-02-20 at 10:27 -0500, Chris Lumens wrote:
> ---
>  pyanaconda/iw/lvm_dialog_gui.py |    6 +++---
>  pyanaconda/iw/partition_gui.py  |    2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/pyanaconda/iw/lvm_dialog_gui.py b/pyanaconda/iw/lvm_dialog_gui.py
> index d2b6b0b..cde9ebf 100644
> --- a/pyanaconda/iw/lvm_dialog_gui.py
> +++ b/pyanaconda/iw/lvm_dialog_gui.py
> @@ -462,7 +462,7 @@ class VolumeGroupEditor:
>              if lv['name']:
>                  lvnameentry.set_text(lv['name'])
>              else:
> -                lvnameentry.set_text(self.storage.createSuggestedLVName(self.getTempVG()))
> +                lvnameentry.set_text(self.storage.suggestDeviceName(self.getTempVG()))

prefix="lv" (or prefix="LogVol" if we want the old behavior) should be
added to the suggestDeviceName call above.

>  
>              # Logical Volume size label & entry
>              lvsizelabel = createAlignedLabel(_("_Size (MB):"))
> @@ -868,7 +868,7 @@ class VolumeGroupEditor:
>  	    return
>  
>          tempvg = self.getTempVG()
> -        name = self.storage.createSuggestedLVName(tempvg)
> +        name = self.storage.suggestDeviceName(tempvg)

Same as above (add prefix of "lv" or "LogVol").

>          format = getFormat(self.storage.defaultFSType)
>          self.lvs[name] = {'name': name,
>                            'size': free,
> @@ -1375,7 +1375,7 @@ class VolumeGroupEditor:
>              if not self.isNew:
>                  self.volnameEntry.set_text(self.vg.name)
>              else:
> -                self.volnameEntry.set_text(self.storage.createSuggestedVGName(anaconda.network.hostname))
> +                self.volnameEntry.set_text(self.storage.suggestContainerName(anaconda.network.hostname))

This also needs a prefix of either "vg" or "VolGroup". I prefer "vg" for
brevity.

>          else:
>              lbl = createAlignedLabel(_("Volume Group Name:"))
>              self.volnameEntry = gtk.Label(self.vg.name)
> diff --git a/pyanaconda/iw/partition_gui.py b/pyanaconda/iw/partition_gui.py
> index 3608159..7f5ca3b 100644
> --- a/pyanaconda/iw/partition_gui.py
> +++ b/pyanaconda/iw/partition_gui.py
> @@ -1783,7 +1783,7 @@ class PartitionWindow(InstallWindow):
>              vgeditor = l_d_g.VolumeGroupEditor(self.anaconda, self.intf, self.parent,
>                      vg, isNew = False)
>              tempvg = vgeditor.getTempVG()
> -            name = self.storage.createSuggestedLVName(tempvg)
> +            name = self.storage.suggestDeviceName(tempvg)

Need prefix here, too.

>              format = getFormat(self.storage.defaultFSType)
>              vgeditor.lvs[name] = {'name': name,
>                                'size': vg.freeSpace,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]