[PATCH] Add support for the realm command

Chris Lumens clumens at redhat.com
Tue Apr 30 14:47:01 UTC 2013


> @@ -81,7 +87,11 @@ def doConfiguration(storage, payload, ksdata, instClass):
>      with progress_report(_("Configuring addons")):
>          ksdata.addons.execute(storage, ksdata, instClass, u)
>          ksdata.configured_spokes.execute(storage, ksdata, instClass, u)
> -        
> +
> +    if ksdata.realm.discovered:
> +        with progress_report(_("Joining realm: %s" % ksdata.realm.discovered)):

The above line should look like this instead:

    with progress_report(_("Joining realm: %s") % ksdata.realm.discovered):

The original line will end up trying to translate the string "Joining
realm: wherever", which is not going to succeed because we won't have
that source string.  In general, you should never do string
substitutions inside a _() call.

> +    def execute(self, *args):
> +        if not self.discovered:
> +            return
> +        for arg in self.join_args:
> +            if arg.startswith("--no-password") or arg.startswith("--one-time-password"):
> +                pw_args = []
> +                break

As long as these args don't take options (--no-password=, for instance),
you can instead do:

    args = self.join_args
    if "--no-password" in args or "--one-time-password" in args:
        ....
    else:
        ....

- Chris


More information about the anaconda-patches mailing list