| 1 |
Author: zmedico |
| 2 |
Date: 2010-01-29 18:52:36 +0000 (Fri, 29 Jan 2010) |
| 3 |
New Revision: 15266 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.7/pym/repoman/utilities.py |
| 7 |
Log: |
| 8 |
Move the DOM unlink call to a finally block. (trunk r15216) |
| 9 |
|
| 10 |
Modified: main/branches/2.1.7/pym/repoman/utilities.py |
| 11 |
=================================================================== |
| 12 |
--- main/branches/2.1.7/pym/repoman/utilities.py 2010-01-29 18:52:28 UTC (rev 15265) |
| 13 |
+++ main/branches/2.1.7/pym/repoman/utilities.py 2010-01-29 18:52:36 UTC (rev 15266) |
| 14 |
@@ -124,28 +124,30 @@ |
| 15 |
raise exception.ParseError("metadata.xml: %s" % (e,)) |
| 16 |
|
| 17 |
try: |
| 18 |
- usetag = metadatadom.getElementsByTagName("use") |
| 19 |
- if not usetag: |
| 20 |
+ |
| 21 |
+ try: |
| 22 |
+ usetag = metadatadom.getElementsByTagName("use") |
| 23 |
+ if not usetag: |
| 24 |
+ return uselist |
| 25 |
+ except NotFoundErr: |
| 26 |
return uselist |
| 27 |
- except NotFoundErr: |
| 28 |
- return uselist |
| 29 |
|
| 30 |
- try: |
| 31 |
- flags = usetag[0].getElementsByTagName("flag") |
| 32 |
- except NotFoundErr: |
| 33 |
- raise exception.ParseError("metadata.xml: " + \ |
| 34 |
- "Malformed input: missing 'flag' tag(s)") |
| 35 |
- |
| 36 |
- for flag in flags: |
| 37 |
- pkg_flag = flag.getAttribute("name") |
| 38 |
- if not pkg_flag: |
| 39 |
+ try: |
| 40 |
+ flags = usetag[0].getElementsByTagName("flag") |
| 41 |
+ except NotFoundErr: |
| 42 |
raise exception.ParseError("metadata.xml: " + \ |
| 43 |
- "Malformed input: missing 'name' attribute for 'flag' tag") |
| 44 |
- uselist.append(pkg_flag) |
| 45 |
+ "Malformed input: missing 'flag' tag(s)") |
| 46 |
|
| 47 |
- metadatadom.unlink() |
| 48 |
- return uselist |
| 49 |
+ for flag in flags: |
| 50 |
+ pkg_flag = flag.getAttribute("name") |
| 51 |
+ if not pkg_flag: |
| 52 |
+ raise exception.ParseError("metadata.xml: " + \ |
| 53 |
+ "Malformed input: missing 'name' attribute for 'flag' tag") |
| 54 |
+ uselist.append(pkg_flag) |
| 55 |
+ return uselist |
| 56 |
|
| 57 |
+ finally: |
| 58 |
+ metadatadom.unlink() |
| 59 |
|
| 60 |
def FindPackagesToScan(settings, startdir, reposplit): |
| 61 |
""" Try to find packages that need to be scanned |
Archives