diff --git a/spritz/src/entropyapi.py b/spritz/src/entropyapi.py
index 237b02444..553a14bae 100644
--- a/spritz/src/entropyapi.py
+++ b/spritz/src/entropyapi.py
@@ -77,12 +77,15 @@ class QueueExecutor:
myrange.append(step)
self.Entropy.progress.total.setup( myrange )
+ self.Spritz.ui.skipMirror.show()
# first fetch all
fetchqueue = 0
for packageInfo in runQueue:
fetchqueue += 1
Package = self.Entropy.Package()
- Package.prepare(packageInfo,"fetch")
+ metaopts = {}
+ metaopts['fetch_abort_function'] = self.Spritz.mirror_bombing
+ Package.prepare(packageInfo,"fetch",metaopts)
self.Entropy.updateProgress(
"Fetching: "+Package.infoDict['atom'],
importance = 2,
@@ -94,6 +97,7 @@ class QueueExecutor:
Package.kill()
del Package
self.Entropy.cycleDone()
+ self.Spritz.ui.skipMirror.hide()
# then removalQueue
# NOT conflicts! :-)
@@ -127,12 +131,14 @@ class QueueExecutor:
del metaopts
del Package
+ self.Spritz.ui.skipMirror.show()
totalqueue = len(runQueue)
currentqueue = 0
for packageInfo in runQueue:
currentqueue += 1
metaopts = {}
+ metaopts['fetch_abort_function'] = self.Spritz.mirror_bombing
metaopts['removeconfig'] = False
Package = self.Entropy.Package()
Package.prepare(packageInfo,"install", metaopts)
@@ -151,6 +157,7 @@ class QueueExecutor:
self.Entropy.cycleDone()
del metaopts
del Package
+ self.Spritz.ui.skipMirror.hide()
return 0,0
diff --git a/spritz/src/etpgui/packages.py b/spritz/src/etpgui/packages.py
index 645d3d597..6f152e635 100644
--- a/spritz/src/etpgui/packages.py
+++ b/spritz/src/etpgui/packages.py
@@ -201,6 +201,9 @@ class EntropyPackage:
def getKeySlot(self):
return self.dbconn.retrieveKeySlot(self.matched_atom[0])
+ def getDescriptionNoMarkup(self):
+ return self.getDescription(markup = False)
+
def getDescription(self, markup = True):
if markup:
return cleanMarkupString(self.dbconn.retrieveDescription(self.matched_atom[0]))
@@ -319,6 +322,7 @@ class EntropyPackage:
sources = property(fget=getSources)
keyslot = property(fget=getKeySlot)
description = property(fget=getDescription)
+ description_nomarkup = property(fget=getDescriptionNoMarkup)
size = property(fget=getDownSize)
intelligentsizeFmt = property(fget=getIntelligentSize)
sizeFmt = property(fget=getDownSizeFmt)
diff --git a/spritz/src/gui.py b/spritz/src/gui.py
index df69c9480..bd275066b 100644
--- a/spritz/src/gui.py
+++ b/spritz/src/gui.py
@@ -97,7 +97,7 @@ class ProgressTotal:
return False
def setAbsProgress( self, now, prefix=None ):
- if (not now >= self.lastFrac) or (now >= 1.0) or (now < 0.0):
+ if (now == self.lastFrac) or (now >= 1.0) or (now < 0.0):
return
while gtk.events_pending(): # process gtk events
gtk.main_iteration()
@@ -162,10 +162,6 @@ class SpritzProgress:
self.ui.progressBar.set_fraction( 0 )
if text != None:
self.ui.progressBar.set_text( text )
- # Check if skip mirror has been pressed
- if self.parent.skipMirrorNow:
- self.parent.skipMirrorNow = False
- self.parent.yumbase._interrupt_callback(None)
self.lastFrac = frac
diff --git a/spritz/src/spritz.glade b/spritz/src/spritz.glade
index 73ddcfd44..4f1bf4234 100644
--- a/spritz/src/spritz.glade
+++ b/spritz/src/spritz.glade
@@ -1029,7 +1029,7 @@
True
- _Skip
+ _Skip mirror
True
@@ -2275,14 +2275,56 @@
3
2
-
+
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 150
+
+
+ 1
+ 2
+ 2
+ 3
+
+
+
+
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 150
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 150
+
+
+ 1
+ 2
+
+
+
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
10
- Your Full Name
+ What you were doing
+ 2
+ 3
GTK_FILL
@@ -2301,59 +2343,17 @@
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
10
- What you were doing
+ Your Full Name
- 2
- 3
GTK_FILL
-
-
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 150
-
-
- 1
- 2
-
-
-
-
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 150
-
-
- 1
- 2
- 1
- 2
-
-
-
-
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 150
-
-
- 1
- 2
- 2
- 3
-
-
3
@@ -2848,18 +2848,103 @@
10
3
-
+
True
- bz2
-gz
+ 0
+ Identifier
+
+
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ Description
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ Download mirrors
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ Database URL
+
+
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+
+ True
+ True
1
2
+
+
+
+
+
+ True
+ True
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+
+ True
+ True
+
+
+ 1
+ 2
+ 3
+ 4
+
+
+
+
+
+ True
+ 0
+ Database compression
+
+
4
5
GTK_FILL
- GTK_FILL
+
@@ -3000,103 +3085,18 @@ gz
-
+
True
- 0
- Database compression
+ bz2
+gz
+ 1
+ 2
4
5
GTK_FILL
-
-
-
-
-
- True
- True
-
-
- 1
- 2
- 3
- 4
-
-
-
-
-
- True
- True
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
- True
- True
-
-
- 1
- 2
-
-
-
-
-
- True
- 0
- Database URL
-
-
- 3
- 4
- GTK_FILL
-
-
-
-
-
- True
- 0
- Download mirrors
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
-
- True
- 0
- Description
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
-
- True
- 0
- Identifier
-
-
- GTK_FILL
-
+ GTK_FILL
@@ -3565,91 +3565,7 @@ gz
5
5
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- True
- True
-
-
- 1
- 2
- 12
- 13
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Creation date
- True
-
-
- 12
- 13
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- True
- True
-
-
- 1
- 2
- 11
- 12
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Install Size
- True
-
-
- 11
- 12
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- True
- True
-
-
- 1
- 2
- 10
- 11
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Package Size
- True
-
-
- 10
- 11
-
-
-
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
@@ -3660,21 +3576,234 @@ gz
1
2
- 9
- 10
+ 1
+ 2
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
- MD5 Signature
+ Website
True
- 9
- 10
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ True
+ True
+
+
+ 1
+ 2
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Location
+ True
+
+
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Version
+ True
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ True
+ True
+
+
+ 1
+ 2
+ 2
+ 3
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Slot
+ True
+
+
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ True
+ True
+
+
+ 1
+ 2
+ 3
+ 4
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Kernel Tag
+ True
+
+
+ 4
+ 5
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ True
+ True
+
+
+ 1
+ 2
+ 4
+ 5
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Revision
+ True
+
+
+ 5
+ 6
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ True
+ True
+
+
+ 1
+ 2
+ 5
+ 6
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Branch
+ True
+
+
+ 6
+ 7
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ True
+ True
+
+
+ 1
+ 2
+ 6
+ 7
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Entropy API
+ True
+
+
+ 7
+ 8
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ True
+ True
+
+
+ 1
+ 2
+ 7
+ 8
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Download Path
+ True
+
+
+ 8
+ 9
@@ -3695,233 +3824,20 @@ gz
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
- Download Path
+ MD5 Signature
True
- 8
- 9
+ 9
+ 10
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- True
- True
-
-
- 1
- 2
- 7
- 8
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Entropy API
- True
-
-
- 7
- 8
- GTK_FILL
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- True
- True
-
-
- 1
- 2
- 6
- 7
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Branch
- True
-
-
- 6
- 7
- GTK_FILL
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- True
- True
-
-
- 1
- 2
- 5
- 6
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Revision
- True
-
-
- 5
- 6
- GTK_FILL
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- True
- True
-
-
- 1
- 2
- 4
- 5
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Kernel Tag
- True
-
-
- 4
- 5
- GTK_FILL
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- True
- True
-
-
- 1
- 2
- 3
- 4
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Slot
- True
-
-
- 3
- 4
- GTK_FILL
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- True
- True
-
-
- 1
- 2
- 2
- 3
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Version
- True
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Location
- True
-
-
- GTK_FILL
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- True
- True
-
-
- 1
- 2
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Website
- True
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
@@ -3932,8 +3848,92 @@ gz
1
2
- 1
- 2
+ 9
+ 10
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Package Size
+ True
+
+
+ 10
+ 11
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ True
+ True
+
+
+ 1
+ 2
+ 10
+ 11
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Install Size
+ True
+
+
+ 11
+ 12
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ True
+ True
+
+
+ 1
+ 2
+ 11
+ 12
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Creation date
+ True
+
+
+ 12
+ 13
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ True
+ True
+
+
+ 1
+ 2
+ 12
+ 13
@@ -3966,7 +3966,7 @@ gz
2
15
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
@@ -3977,57 +3977,21 @@ gz
1
2
- 3
- 4
+ 2
+ 3
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
- Masked
+ CXXFLAGS
True
- 3
- 4
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- CHOST
- True
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- True
- True
- True
-
-
- 1
- 2
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- CFLAGS
- True
-
-
- 1
- 2
+ 2
+ 3
@@ -4047,20 +4011,20 @@ gz
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
- CXXFLAGS
+ CFLAGS
True
- 2
- 3
+ 1
+ 2
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
@@ -4071,8 +4035,44 @@ gz
1
2
- 2
- 3
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ CHOST
+ True
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Masked
+ True
+
+
+ 3
+ 4
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ True
+ True
+ True
+
+
+ 1
+ 2
+ 3
+ 4
@@ -5262,15 +5262,23 @@ Please read them carefully and <b>make your choice</b>.
2
2
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 1
+ 0
+ Announced
+ True
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Revised
True
- 1
- 2
1
2
@@ -5288,27 +5296,19 @@ Please read them carefully and <b>make your choice</b>.
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Revised
+ 1
True
+ 1
+ 2
1
2
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Announced
- True
-
-
diff --git a/spritz/src/spritz.py b/spritz/src/spritz.py
index 659ba9660..acb06fad9 100644
--- a/spritz/src/spritz.py
+++ b/spritz/src/spritz.py
@@ -820,9 +820,13 @@ class SpritzController(Controller):
self.unsetBusy()
def on_skipMirror_clicked(self,widget):
- if self.skipMirror:
- self.logger.info('skipmirror')
- self.skipMirrorNow = True
+ self.skipMirrorNow = True
+
+ def mirror_bombing(self):
+ if self.skipMirrorNow:
+ self.skipMirrorNow = False
+ mytxt = _("Skipping current mirror.")
+ raise exceptionTools.OnlineMirrorError('OnlineMirrorError %s' % (mytxt,))
def on_search_clicked(self,widget):
''' Search entry+button handler'''
@@ -876,7 +880,6 @@ class SpritzApplication(SpritzController,SpritzGUI):
self.logger = logging.getLogger("yumex.main")
# init flags
- self.skipMirror = False
self.skipMirrorNow = False
self.doProgress = False
self.categoryOn = False
@@ -975,9 +978,10 @@ class SpritzApplication(SpritzController,SpritzGUI):
if os.access('/usr/bin/gedit',os.X_OK):
self.fileEditor = '/usr/bin/gedit'
- def startWorking(self):
+ def startWorking(self, do_busy = True):
self.isWorking = True
- busyCursor(self.ui.main)
+ if do_busy:
+ busyCursor(self.ui.main)
self.ui.progressVBox.grab_add()
gtkEventThread.startProcessing()
@@ -1173,7 +1177,8 @@ class SpritzApplication(SpritzController,SpritzGUI):
total = len( pkgs['i'] )+len( pkgs['u'] )+len( pkgs['r'] ) +len( pkgs['rr'] )
state = True
if total > 0:
- self.startWorking()
+ self.startWorking(do_busy = True)
+ normalCursor(self.ui.main)
self.progress.show()
self.progress.set_mainLabel( _( "Processing Packages in queue" ) )
@@ -1184,6 +1189,7 @@ class SpritzApplication(SpritzController,SpritzGUI):
if install_queue or removal_queue:
controller = QueueExecutor(self)
e,i = controller.run(install_queue[:], removal_queue[:], do_purge_cache)
+ self.ui.skipMirror.hide()
if e != 0:
okDialog( self.ui.main,
_("Attention. An error occured when processing the queue."
@@ -1243,21 +1249,9 @@ if __name__ == "__main__":
gtkEventThread.doQuit()
sys.exit(1)
except: # catch other exception and write it to the logger.
- logger = logging.getLogger('yumex.main')
etype = sys.exc_info()[0]
evalue = sys.exc_info()[1]
etb = traceback.extract_tb(sys.exc_info()[2])
- logger.error('Error Type: %s' % str(etype) )
- errmsg = 'Error Type: %s \n' % str(etype)
- logger.error('Error Value: ' + str(evalue))
- errmsg += 'Error Value: %s \n' % str(evalue)
- logger.error('Traceback: \n')
- for tub in etb:
- f,l,m,c = tub # file,lineno, function, codeline
- logger.error(' File : %s , line %s, in %s' % (f,str(l),m))
- errmsg += ' File : %s , line %s, in %s\n' % (f,str(l),m)
- logger.error(' %s ' % c)
- errmsg += ' %s \n' % c
import entropyTools
conntest = entropyTools.get_remote_data(etpConst['conntestlink'])
rc, (name,mail,description) = errorMessage( None,
diff --git a/spritz/src/views.py b/spritz/src/views.py
index 506ce1d63..1f0dc2261 100644
--- a/spritz/src/views.py
+++ b/spritz/src/views.py
@@ -718,7 +718,7 @@ class EntropyQueueView:
def populate_list( self, label, mylist ):
parent = self.model.append( None, [label, ""] )
for pkg in mylist:
- self.model.append( parent, [str( pkg ), pkg.description] )
+ self.model.append( parent, [str( pkg ), pkg.description_nomarkup] )
class EntropyFilesView:
""" Queue View Class"""