[51347] trunk/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 51347
          http://trac.macports.org/changeset/51347
Author:   jmr at macports.org
Date:     2009-05-23 01:28:49 -0700 (Sat, 23 May 2009)
Log Message:
-----------
upgrade: make sure we always mportclose what we mportopened

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2009-05-23 07:59:30 UTC (rev 51346)
+++ trunk/base/src/macports1.0/macports.tcl	2009-05-23 08:28:49 UTC (rev 51347)
@@ -2237,10 +2237,12 @@
                     global errorInfo
                     ui_debug "$errorInfo"
                     ui_error "Unable to exec port: $result"
+                    catch {mportclose $workername}
                     return 1
                 }
                 if {$result > 0} {
                     ui_error "Problem while installing $portname"
+                    catch {mportclose $workername}
                     return $result
                 }
                 # we just installed it, so mark it done in the cache
@@ -2254,6 +2256,7 @@
             }
             # the rest of the proc doesn't matter for a port that is freshly
             # installed or not installed
+            mportclose $workername
             return 0
         } else {
             ui_error "Checking installed version failed: $result"
@@ -2402,7 +2405,7 @@
                     }
                 }
             }
-
+            mportclose $workername
             return 0
         } else {
             set epoch_override 1
@@ -2425,6 +2428,7 @@
             global errorInfo
             ui_debug "$errorInfo"
             ui_error "Unable to upgrade port: $result"
+            catch {mportclose $workername}
             return 1
         }
     }
@@ -2442,6 +2446,7 @@
             global errorInfo
             ui_debug "$errorInfo"
             ui_error "Uninstall $portname ${version_installed}_${revision_installed}${variant_installed} failed: $result"
+            catch {mportclose $workername}
             return 1
         }
         if {!$force_cur} {
@@ -2460,6 +2465,7 @@
                 global errorInfo
                 ui_debug "$errorInfo"
                 ui_error "Uninstall $portname ${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants) failed: $result"
+                catch {mportclose $workername}
                 return 1
             }
             if {!$force_cur} {
@@ -2478,6 +2484,7 @@
                 global errorInfo
                 ui_debug "$errorInfo"
                 ui_error "Deactivating $portname ${version_active}_${revision_active} failed: $result"
+                catch {mportclose $workername}
                 return 1
             }
         }
@@ -2494,6 +2501,7 @@
         global errorInfo
         ui_debug "$errorInfo"
         ui_error "Couldn't activate $portname ${version_in_tree}_${revision_in_tree}: $result"
+        catch {mportclose $workername}
         return 1
     }
 
@@ -2512,6 +2520,7 @@
                 global errorInfo
                 ui_debug "$errorInfo"
                 ui_error "Uninstall $portname @${version}_${revision}${variant} failed: $result"
+                catch {mportclose $workername}
                 return 1
             }
         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090523/a82873a8/attachment.html>