Re: [PATCH 2/3] Don't underflow on the busy cursor stack.

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

 



I think it should look like this instead:

diff --git a/storage/__init__.py b/storage/__init__.py
index fd9f289..2b0ccd6 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -264,17 +266,14 @@ class Storage(object):
                                          luksDict=self.__luksDevs)
             self.devicetree.populate()
             self.fsset = FSSet(self.devicetree)
-            w.pop()
         except FSError as e:
-            if w:
-                w.pop()
-
             self.anaconda.intf.messageWindow(_("Error"),
                 _("Filesystem error detected, cannot continue."),
                 custom_icon="error")
             sys.exit(0)
         finally:
-            w.pop()
+            if w:
+                w.pop()
 
     @property
     def devices(self):


On Wed, 2009-03-25 at 11:49 -0400, Chris Lumens wrote:
> ---
>  storage/__init__.py |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/storage/__init__.py b/storage/__init__.py
> index fd9f289..4eb2870 100644
> --- a/storage/__init__.py
> +++ b/storage/__init__.py
> @@ -273,8 +273,6 @@ class Storage(object):
>                  _("Filesystem error detected, cannot continue."),
>                  custom_icon="error")
>              sys.exit(0)
> -        finally:
> -            w.pop()
>  
>      @property
>      def devices(self):

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux