diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
| commit | 7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 (patch) | |
| tree | 3c34a3a180b5275bd4166b0056765c5868f56447 /indra/mac_updater | |
| parent | f6a10b3214d79df4e8f5768acaa68edbd2de5620 (diff) | |
Merge down from Branch_1-18-1:
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
Diffstat (limited to 'indra/mac_updater')
| -rw-r--r-- | indra/mac_updater/mac_updater.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/mac_updater/mac_updater.cpp b/indra/mac_updater/mac_updater.cpp index 91bf24ec11..ecef6e6b77 100644 --- a/indra/mac_updater/mac_updater.cpp +++ b/indra/mac_updater/mac_updater.cpp @@ -971,10 +971,12 @@ void *updatethreadproc(void*) if(len < sizeof(temp)-1) { // End of file or error. - if(pclose(mounter) != 0) + int result = pclose(mounter); + if(result != 0) { - llinfos << "Failed to mount disk image, exiting."<< llendl; - throw 0; + // NOTE: We used to abort here, but pclose() started returning + // -1, possibly when the size of the DMG passed a certain point + llinfos << "Unexpected result closing pipe: " << result << llendl; } mounter = NULL; } @@ -1000,6 +1002,7 @@ void *updatethreadproc(void*) else { llinfos << "Disk image device node not found!" << llendl; + throw 0; } // Get an FSRef to the new application on the disk image |