| 1 |
Author: grobian |
| 2 |
Date: 2009-09-05 10:55:47 +0000 (Sat, 05 Sep 2009) |
| 3 |
New Revision: 14194 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/man/ebuild.5 |
| 7 |
main/branches/prefix/pym/_emerge/PollScheduler.py |
| 8 |
main/branches/prefix/pym/portage/versions.py |
| 9 |
Log: |
| 10 |
Merged from trunk -r14182:14186 |
| 11 |
|
| 12 |
| 14184 | Fix documentation of some QA_* variables. | |
| 13 |
| arfrever | | |
| 14 |
|
| 15 |
| 14185 | Bug #282808 - Handle a potential KeyError inside | |
| 16 |
| zmedico | PollScheduler._poll_loop() when _poll_event_queue contains | |
| 17 |
| | an event for a file descriptor that has already been | |
| 18 |
| | unregistered. | |
| 19 |
|
| 20 |
| 14186 | Remove unnecessary redundant dict lookup at the beginning | |
| 21 |
| zmedico | of catpkgsplit(). Thanks to Marat Radchenko | |
| 22 |
| | <slonopotamusorama@×××××.com> for this patch. | |
| 23 |
|
| 24 |
|
| 25 |
Modified: main/branches/prefix/man/ebuild.5 |
| 26 |
=================================================================== |
| 27 |
--- main/branches/prefix/man/ebuild.5 2009-09-05 10:54:56 UTC (rev 14193) |
| 28 |
+++ main/branches/prefix/man/ebuild.5 2009-09-05 10:55:47 UTC (rev 14194) |
| 29 |
@@ -480,7 +480,7 @@ |
| 30 |
\fBQA_TEXTRELS\fR |
| 31 |
This variable can be set to a list of file paths, relative to the image |
| 32 |
directory, of files that contain text relocations that cannot be eliminated. |
| 33 |
-The paths may contain regular expressions. |
| 34 |
+The paths may contain fnmatch patterns. |
| 35 |
.br |
| 36 |
This variable is intended to be used on closed\-source binary objects that |
| 37 |
cannot be altered. |
| 38 |
@@ -488,7 +488,7 @@ |
| 39 |
\fBQA_EXECSTACK\fR |
| 40 |
This should contain a list of file paths, relative to the image directory, of |
| 41 |
objects that require executable stack in order to run. |
| 42 |
-The paths may contain regular expressions. |
| 43 |
+The paths may contain fnmatch patterns. |
| 44 |
.br |
| 45 |
This variable is intended to be used on objects that truly need executable |
| 46 |
stack (i.e. not those marked to need it which in fact do not). |
| 47 |
@@ -496,7 +496,7 @@ |
| 48 |
\fBQA_WX_LOAD\fR |
| 49 |
This should contain a list of file paths, relative to the image directory, of |
| 50 |
files that contain writable and executable segments. These are rare. |
| 51 |
-The paths may contain regular expressions. |
| 52 |
+The paths may contain fnmatch patterns. |
| 53 |
.TP |
| 54 |
\fBQA_DT_HASH\fR |
| 55 |
This should contain a list of file paths, relative to the image directory, of |
| 56 |
|
| 57 |
Modified: main/branches/prefix/pym/_emerge/PollScheduler.py |
| 58 |
=================================================================== |
| 59 |
--- main/branches/prefix/pym/_emerge/PollScheduler.py 2009-09-05 10:54:56 UTC (rev 14193) |
| 60 |
+++ main/branches/prefix/pym/_emerge/PollScheduler.py 2009-09-05 10:55:47 UTC (rev 14194) |
| 61 |
@@ -123,7 +123,14 @@ |
| 62 |
try: |
| 63 |
while event_handlers: |
| 64 |
f, event = self._next_poll_event() |
| 65 |
- handler, reg_id = event_handlers[f] |
| 66 |
+ try: |
| 67 |
+ handler, reg_id = event_handlers[f] |
| 68 |
+ except KeyError: |
| 69 |
+ # This means unregister was called for a file descriptor |
| 70 |
+ # that still had a pending event in _poll_event_queue. |
| 71 |
+ # Since unregister has been called, we should assume that |
| 72 |
+ # the event can be safely ignored. |
| 73 |
+ continue |
| 74 |
handler(f, event) |
| 75 |
event_handled = True |
| 76 |
except StopIteration: |
| 77 |
|
| 78 |
Modified: main/branches/prefix/pym/portage/versions.py |
| 79 |
=================================================================== |
| 80 |
--- main/branches/prefix/pym/portage/versions.py 2009-09-05 10:54:56 UTC (rev 14193) |
| 81 |
+++ main/branches/prefix/pym/portage/versions.py 2009-09-05 10:55:47 UTC (rev 14194) |
| 82 |
@@ -292,8 +292,6 @@ |
| 83 |
""" |
| 84 |
|
| 85 |
try: |
| 86 |
- if not catcache[mydata]: |
| 87 |
- return None |
| 88 |
return catcache[mydata] |
| 89 |
except KeyError: |
| 90 |
pass |
Archives