FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Development

 
 
LinkBack Thread Tools
 
Old 03-25-2009, 02:49 PM
Chris Lumens
 
Default Don't underflow on the busy cursor stack.

---
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):
--
1.6.1.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 
Old 03-25-2009, 03:26 PM
David Lehman
 
Default Don't underflow on the busy cursor stack.

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@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 
Old 03-25-2009, 03:41 PM
Chris Lumens
 
Default Don't underflow on the busy cursor stack.

> I think it should look like this instead:

It doesn't really matter, but what I did is the idiom we use throughout
anaconda already.

- Chris

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

Thread Tools




All times are GMT. The time now is 07:20 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org