[RHEL 7.2 - PATCH] Fix GRUB2 Password Update Scope (#985962)

[Robert Marshall]

Change scoping of variable to resolve issue in unit test.

Resolves: rhbz#985962
---
 pyanaconda/bootloader.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index bdebb2e..510ab07 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -1528,7 +1528,7 @@ class GRUB2(GRUB):
         if not self.password and not self.encrypted_password:
             return

-        users_file = "%s%s/%s" % (iutil.getSysroot(), self.config_dir, _passwd_file)
+        users_file = "%s%s/%s" % (iutil.getSysroot(), self.config_dir, self._passwd_file)
         header = open(users_file, "w")
         # XXX FIXME: document somewhere that the username is "root"
         self._encrypt_password()

[Brian C. Lane]

On Tue, Jul 07, 2015 at 02:05:36PM -0400, Robert Marshall wrote:
> Change scoping of variable to resolve issue in unit test.
> Resolves: rhbz#985962
>
> pyanaconda/bootloader.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
> index bdebb2e..510ab07 100644
> --- a/pyanaconda/bootloader.py
> +++ b/pyanaconda/bootloader.py
> @@ -1528,7 +1528,7 @@ class GRUB2(GRUB):
>          if not self.password and not self.encrypted_password:
>              return
>    users_file = "%s%s/%s" % (iutil.getSysroot(), self.config_dir, _passwd_file)
>    users_file = "%s%s/%s" % (iutil.getSysroot(), self.config_dir, self._passwd_file)
>    header = open(users_file, "w")
>    # XXX FIXME: document somewhere that the username is "root"
>    self._encrypt_password()
>
> -- 
> 1.8.3.1

Ack

[Vratislav Podzimek]

On Tue, 2015-07-07 at 11:08 -0700, Brian C. Lane wrote:
> On Tue, Jul 07, 2015 at 02:05:36PM -0400, Robert Marshall wrote:
> > Change scoping of variable to resolve issue in unit test.
> > Resolves: rhbz#985962
> >
> > pyanaconda/bootloader.py | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
> > index bdebb2e..510ab07 100644
> > --- a/pyanaconda/bootloader.py
> > +++ b/pyanaconda/bootloader.py
> > @@ -1528,7 +1528,7 @@ class GRUB2(GRUB):
> >          if not self.password and not self.encrypted_password:
> >              return
> >    users_file = "%s%s/%s" % (iutil.getSysroot(), self.config_dir, _passwd_file)
> >    users_file = "%s%s/%s" % (iutil.getSysroot(), self.config_dir, self._passwd_file)
> >    header = open(users_file, "w")
> >    # XXX FIXME: document somewhere that the username is "root"
> >    self._encrypt_password()
> >
> > -- 
> > 1.8.3.1
>
> Ack

AckAck