[gentoo-commits] portage r14194 - in main/branches/prefix: man pym/_emerge pym/portage

[gentoo-commits] portage r14194 - in main/branches/prefix: man pym/_emerge pym/portage

[Fabian Groffen (grobian)]

Author: grobian
Date: 2009-09-05 10:55:47 +0000 (Sat, 05 Sep 2009)
New Revision: 14194

Modified:
   main/branches/prefix/man/ebuild.5
   main/branches/prefix/pym/_emerge/PollScheduler.py
   main/branches/prefix/pym/portage/versions.py
Log:
   Merged from trunk -r14182:14186

   | 14184    | Fix documentation of some QA_* variables.                   |
   | arfrever |                                                             |
   
   | 14185    | Bug #282808 - Handle a potential KeyError inside            |
   | zmedico  | PollScheduler._poll_loop() when _poll_event_queue contains  |
   |          | an event for a file descriptor that has already been        |
   |          | unregistered.                                               |
   
   | 14186    | Remove unnecessary redundant dict lookup at the beginning   |
   | zmedico  | of catpkgsplit(). Thanks to Marat Radchenko                 |
   |          | <slonopotamusorama@gmail.com> for this patch.               |


Modified: main/branches/prefix/man/ebuild.5
===================================================================
--- main/branches/prefix/man/ebuild.5	2009-09-05 10:54:56 UTC (rev 14193)
+++ main/branches/prefix/man/ebuild.5	2009-09-05 10:55:47 UTC (rev 14194)
@@ -480,7 +480,7 @@
 \fBQA_TEXTRELS\fR
 This variable can be set to a list of file paths, relative to the image
 directory, of files that contain text relocations that cannot be eliminated.
-The paths may contain regular expressions.
+The paths may contain fnmatch patterns.
 .br
 This variable is intended to be used on closed\-source binary objects that
 cannot be altered.
@@ -488,7 +488,7 @@
 \fBQA_EXECSTACK\fR
 This should contain a list of file paths, relative to the image directory, of
 objects that require executable stack in order to run.
-The paths may contain regular expressions.
+The paths may contain fnmatch patterns.
 .br
 This variable is intended to be used on objects that truly need executable
 stack (i.e. not those marked to need it which in fact do not).
@@ -496,7 +496,7 @@
 \fBQA_WX_LOAD\fR
 This should contain a list of file paths, relative to the image directory, of
 files that contain writable and executable segments.  These are rare.
-The paths may contain regular expressions.
+The paths may contain fnmatch patterns.
 .TP
 \fBQA_DT_HASH\fR
 This should contain a list of file paths, relative to the image directory, of

Modified: main/branches/prefix/pym/_emerge/PollScheduler.py
===================================================================
--- main/branches/prefix/pym/_emerge/PollScheduler.py	2009-09-05 10:54:56 UTC (rev 14193)
+++ main/branches/prefix/pym/_emerge/PollScheduler.py	2009-09-05 10:55:47 UTC (rev 14194)
@@ -123,7 +123,14 @@
 		try:
 			while event_handlers:
 				f, event = self._next_poll_event()
-				handler, reg_id = event_handlers[f]
+				try:
+					handler, reg_id = event_handlers[f]
+				except KeyError:
+					# This means unregister was called for a file descriptor
+					# that still had a pending event in _poll_event_queue.
+					# Since unregister has been called, we should assume that
+					# the event can be safely ignored.
+					continue
 				handler(f, event)
 				event_handled = True
 		except StopIteration:

Modified: main/branches/prefix/pym/portage/versions.py
===================================================================
--- main/branches/prefix/pym/portage/versions.py	2009-09-05 10:54:56 UTC (rev 14193)
+++ main/branches/prefix/pym/portage/versions.py	2009-09-05 10:55:47 UTC (rev 14194)
@@ -292,8 +292,6 @@
 	"""
 
 	try:
-		if not catcache[mydata]:
-			return None
 		return catcache[mydata]
 	except KeyError:
 		pass