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

Re: [f16-branch] nfsiso: handle mismatching .iso architecture gracefully.



> @@ -162,30 +164,32 @@ def mountDirectory(methodstr, messageWindow):
>                  continue
>  
>  def mountImage(isodir, tree, messageWindow):
> +    def complain():
> +        ans = messageWindow(_("Missing ISO 9660 Image"),
> +                            _("The installer has tried to mount the "
> +                              "installation image, but cannot find it on "
> +                              "the hard drive.\n\n"
> +                              "Please copy this image to the "
> +                              "drive and click Retry.  Click Exit "
> +                              "to abort the installation."),
> +                              type="custom",
> +                              custom_icon="warning",
> +                              custom_buttons=[_("_Exit"), _("_Retry")])
> +        if ans == 0:
> +            sys.exit(0)
> +
>      if os.path.ismount(tree):
>          raise SystemError, "trying to mount already-mounted iso image!"
> -
> -    image = findFirstIsoImage(isodir, messageWindow)
> -
>      while True:
> +        image = findFirstIsoImage(isodir, messageWindow)
> +        if image is None:
> +            complain()
> +            continue

Looks fine, just please put a newline after this continue and before the
try.

- Chris


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