December 2012 - macports-changes - lists.macosforge.org

[100227] trunk/dports/python
by g5pw＠macports.org 04 Dec '12

04 Dec '12

Revision: 100227 https://trac.macports.org/changeset/100227 Author: g5pw(a)macports.org Date: 2012-12-04 04:45:57 -0800 (Tue, 04 Dec 2012) Log Message: ----------- python/ninja-ide: - new port, python IDE Added Paths: ----------- trunk/dports/python/ninja-ide/ trunk/dports/python/ninja-ide/Portfile Added: trunk/dports/python/ninja-ide/Portfile =================================================================== --- trunk/dports/python/ninja-ide/Portfile (rev 0) +++ trunk/dports/python/ninja-ide/Portfile 2012-12-04 12:45:57 UTC (rev 100227) @@ -0,0 +1,27 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=portfile:et:sw=4:ts=4:sts=4 +# $Id$ + +PortSystem 1.0 +PortGroup github 1.0 +PortGroup python 1.0 + +github.setup ninja-ide ninja-ide 2.1.1 v +python.default_version 27 +maintainers g5pw openmaintainer + +categories python devel +description Ninja-IDE Is Not Just Another IDE. +long_description Ninja-IDE is a cross-platform integrated development \ + environment (IDE) that runs on Linux/X11, Mac OS X and \ + Windows desktop operating systems. +license GPL-3 + +platforms darwin + +depends_lib port:py${python.version}-pyqt4 \ + port:py${python.version}-macfsevents + +checksums rmd160 488787cb3e0900dacee7ac09afa92148594ce71a \ + sha256 534a891dfdaa262fd6465d2d72672eb29e494401968ba31c483f9eab31f3d5a8 + +python.link_binaries_suffix Property changes on: trunk/dports/python/ninja-ide/Portfile ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native

1 0

[100226] trunk/dports/science/gnuradio/Portfile
by michaelld＠macports.org 04 Dec '12

04 Dec '12

Revision: 100226 https://trac.macports.org/changeset/100226 Author: michaelld(a)macports.org Date: 2012-12-04 04:32:05 -0800 (Tue, 04 Dec 2012) Log Message: ----------- gnuradio : update devel and next to latest. Modified Paths: -------------- trunk/dports/science/gnuradio/Portfile Modified: trunk/dports/science/gnuradio/Portfile =================================================================== --- trunk/dports/science/gnuradio/Portfile 2012-12-04 05:58:45 UTC (rev 100225) +++ trunk/dports/science/gnuradio/Portfile 2012-12-04 12:32:05 UTC (rev 100226) @@ -60,13 +60,13 @@ long_description ${description}: \ This port is kept up with the GNU Radio GIT Master branch, which is typically updated every few days to week. This version of GNU Radio generally contains fixes to, and its API is compatible with, the current GNU Radio release, and will be incorporated in an upcoming release. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. - version 3.6.3_20121127 + version 3.6.3_20121203 conflicts gnuradio gnuradio-next fetch.type git git.url git://gnuradio.org/gnuradio.git - git.branch 61b99449eeaaebe5ccc10758549add9c9e23f710 + git.branch ef74b48c155bfcec2f560c9a4a23592814699eda post-configure { @@ -89,13 +89,13 @@ long_description ${description}: \ This port is kept up with the GNU Radio GIT Next branch, which is typically updated every few days to week. This version of GNU Radio represents the next major release of GNU Radio, and hence its API is likely to be different than that provided by either gnuradio or gnuradio-devel. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. - version 3.7.0_20121127 + version 3.7.0_20121203 conflicts gnuradio gnuradio-devel fetch.type git git.url git://gnuradio.org/gnuradio.git - git.branch e5929906700f3d6fa474fc5d9a8650b1fafbc2a1 + git.branch 744e351c408eba97030aa25c31eeddd6139114db post-configure { @@ -189,7 +189,8 @@ configure.args-append \ -DPYTHON_EXECUTABLE=${prefix}/bin/python${v} \ -DPYTHON_INCLUDE_DIR=${prefix}/Library/Frameworks/Python.framework/Versions/${v}/Headers \ - -DPYTHON_LIBRARY=${prefix}/Library/Frameworks/Python.framework/Versions/${v}/Python + -DPYTHON_LIBRARY=${prefix}/Library/Frameworks/Python.framework/Versions/${v}/Python \ + -DGR_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/${v}/lib/python${v}/site-packages # check for variants that require Python @@ -228,16 +229,15 @@ post-destroot { if {[variant_isset swig]} { + if {[file exists ${destroot}${prefix}/lib/python${v}/site-packages]} { + # move python scripts from + # ${prefix}/lib/python${v}/site-packages/* to + # ${frameworks_dir}/Python.framework/Versions/${v}/ + # lib/python${v}/site-packages/* - # move python scripts from - # ${prefix}/lib/python${v}/site-packages/* to - # ${frameworks_dir}/Python.framework/Versions/${v}/ - # lib/python${v}/site-packages/* - - xinstall -m 755 -d ${destroot}${frameworks_dir}/Python.framework/Versions/${v}/lib/python${v} - move ${destroot}${prefix}/lib/python${v}/site-packages \ - ${destroot}${frameworks_dir}/Python.framework/Versions/${v}/lib/python${v} - + xinstall -m 755 -d ${destroot}${frameworks_dir}/Python.framework/Versions/${v}/lib/python${v} + move ${destroot}${prefix}/lib/python${v}/site-packages ${destroot}${frameworks_dir}/Python.framework/Versions/${v}/lib/python${v} + } } } }

1 0

[100225] users/pixilla/scripts/mp-trac-tickets-port
by pixilla＠macports.org 04 Dec '12

04 Dec '12

Revision: 100225 https://trac.macports.org/changeset/100225 Author: pixilla(a)macports.org Date: 2012-12-03 21:58:45 -0800 (Mon, 03 Dec 2012) Log Message: ----------- users/pixilla: - Make script handle more input queries. Modified Paths: -------------- users/pixilla/scripts/mp-trac-tickets-port Modified: users/pixilla/scripts/mp-trac-tickets-port =================================================================== --- users/pixilla/scripts/mp-trac-tickets-port 2012-12-04 05:57:43 UTC (rev 100224) +++ users/pixilla/scripts/mp-trac-tickets-port 2012-12-04 05:58:45 UTC (rev 100225) @@ -6,7 +6,7 @@ exit fi -PORTS=$(port echo "$@") +PORTS=$(port -q echo "$@") QUERY="status=!closed&" OR="" for PORT in $PORTS;do

1 0

[100224] users/pixilla/scripts/mp-distributable
by pixilla＠macports.org 04 Dec '12

04 Dec '12

Revision: 100224 https://trac.macports.org/changeset/100224 Author: pixilla(a)macports.org Date: 2012-12-03 21:57:43 -0800 (Mon, 03 Dec 2012) Log Message: ----------- users/pixilla: - Make distributable script loop through port echo query. Modified Paths: -------------- users/pixilla/scripts/mp-distributable Modified: users/pixilla/scripts/mp-distributable =================================================================== --- users/pixilla/scripts/mp-distributable 2012-12-04 00:50:31 UTC (rev 100223) +++ users/pixilla/scripts/mp-distributable 2012-12-04 05:57:43 UTC (rev 100224) @@ -12,4 +12,7 @@ echo "mp-distributable zlib" exit 1 fi -${MP_SVNBASE}/portmgr/jobs/port_binary_distributable.tcl -v "$@" +PORTS=$(port -q echo "$@") +for PORT in $PORTS;do + ${MP_SVNBASE}/portmgr/jobs/port_binary_distributable.tcl -v "$PORT" +done

1 0

[100223] branches/release_2_1/base
by cal＠macports.org 04 Dec '12

04 Dec '12

Revision: 100223 https://trac.macports.org/changeset/100223 Author: cal(a)macports.org Date: 2012-12-03 16:50:31 -0800 (Mon, 03 Dec 2012) Log Message: ----------- Merge from trunk: r100129, r100217-100219, r100220 r100129: Fix endless loop in rev-upgrade on broken or old portindex r100217-19: Fixes and small optimizations in registry code r100220: ChangeLog entry Revision Links: -------------- https://trac.macports.org/changeset/100129 https://trac.macports.org/changeset/100217 https://trac.macports.org/changeset/100220 https://trac.macports.org/changeset/100129 https://trac.macports.org/changeset/100217 https://trac.macports.org/changeset/100220 Modified Paths: -------------- branches/release_2_1/base/ChangeLog branches/release_2_1/base/src/cregistry/registry.c branches/release_2_1/base/src/macports1.0/macports.tcl branches/release_2_1/base/src/registry2.0/portuninstall.tcl Property Changed: ---------------- branches/release_2_1/base/ branches/release_2_1/base/ChangeLog branches/release_2_1/base/src/macports1.0/ Property changes on: branches/release_2_1/base ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/gsoc11-rev-upgrade/base:78828-88375 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96399-96401,96538-96539,97868-97869 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/gsoc11-rev-upgrade/base:78828-88375 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96399-96401,96538-96539,97868-97869,100129,100217-100220 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Modified: branches/release_2_1/base/ChangeLog =================================================================== --- branches/release_2_1/base/ChangeLog 2012-12-04 00:44:27 UTC (rev 100222) +++ branches/release_2_1/base/ChangeLog 2012-12-04 00:50:31 UTC (rev 100223) @@ -13,6 +13,22 @@ ccache >= 3.1.7 by running the initialization step as the macportsuser. (raimue in r97868) + - Fix an endless loop that could be triggered in rev-upgrade when a user + hasn't run selfupdate in more than a year or the portindex is corrupt. + (cal in r100129) + + - Set a busy timeout on SQLite connections to prevent MacPorts from + uselessly burning CPU cycles when waiting for a database lock. + (cal in r100217) + + - Switch from exclusive locking to immediate locking in the registry + database to avoid locking reads where not needed. + (cal in r100218) + + - Fix a problem where interrupting the uninstallation process could leave + the registry database in a corrupted state. + (cal in r100219) + Release 2.1.2 (2012-07-26 by jmr): - Fixed autodetection of developer_dir with Xcode 4.4 (#35150, mfeiri in r95552) Property changes on: branches/release_2_1/base/ChangeLog ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/ChangeLog:37343-46937 /branches/gsoc09-logging/base/ChangeLog:51231-60371 /branches/gsoc11-rev-upgrade/base/ChangeLog:78828-88375 /branches/universal-sanity/base/ChangeLog:51872-52323 /branches/variant-descs-14482/base/ChangeLog:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/ChangeLog:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,93062,93129,93153,93197,93225,93250,93256,93268,93274,95439,95620,95873,96137,96399-96401,96539,97869 /users/perry/base-bugs_and_notes/ChangeLog:45682-46060 /users/perry/base-select/ChangeLog:44044-44692 + /branches/gsoc08-privileges/base/ChangeLog:37343-46937 /branches/gsoc09-logging/base/ChangeLog:51231-60371 /branches/gsoc11-rev-upgrade/base/ChangeLog:78828-88375 /branches/universal-sanity/base/ChangeLog:51872-52323 /branches/variant-descs-14482/base/ChangeLog:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/ChangeLog:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,93062,93129,93153,93197,93225,93250,93256,93268,93274,95439,95620,95873,96137,96399-96401,96539,97869,100129,100217-100220 /users/perry/base-bugs_and_notes/ChangeLog:45682-46060 /users/perry/base-select/ChangeLog:44044-44692 Modified: branches/release_2_1/base/src/cregistry/registry.c =================================================================== --- branches/release_2_1/base/src/cregistry/registry.c 2012-12-04 00:44:27 UTC (rev 100222) +++ branches/release_2_1/base/src/cregistry/registry.c 2012-12-04 00:50:31 UTC (rev 100223) @@ -118,6 +118,8 @@ sqlite3_extended_result_codes(reg->db, 1); #endif + sqlite3_busy_timeout(reg->db, 25); + if (init_db(reg->db, errPtr)) { reg->status = reg_none; *regPtr = reg; @@ -364,7 +366,7 @@ * @return true if success; false if failure */ int reg_start_write(reg_registry* reg, reg_error* errPtr) { - if (reg_start(reg, "BEGIN EXCLUSIVE", errPtr)) { + if (reg_start(reg, "BEGIN IMMEDIATE", errPtr)) { reg->status |= reg_transacting | reg_can_write; return 1; } else { Property changes on: branches/release_2_1/base/src/macports1.0 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/macports1.0:37343-46937 /branches/gsoc09-logging/base/src/macports1.0:51231-60371 /branches/gsoc11-rev-upgrade/base/src/macports1.0:78828-88375 /branches/universal-sanity/base/src/macports1.0:51872-52323 /branches/variant-descs-14482/base/src/macports1.0:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/macports1.0:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93221,93816,93962,95552 /users/perry/base-bugs_and_notes/src/macports1.0:45682-46060 /users/perry/base-select/src/macports1.0:44044-44692 + /branches/gsoc08-privileges/base/src/macports1.0:37343-46937 /branches/gsoc09-logging/base/src/macports1.0:51231-60371 /branches/gsoc11-rev-upgrade/base/src/macports1.0:78828-88375 /branches/universal-sanity/base/src/macports1.0:51872-52323 /branches/variant-descs-14482/base/src/macports1.0:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/macports1.0:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93221,93816,93962,95552,100129,100217-100219 /users/perry/base-bugs_and_notes/src/macports1.0:45682-46060 /users/perry/base-select/src/macports1.0:44044-44692 Modified: branches/release_2_1/base/src/macports1.0/macports.tcl =================================================================== --- branches/release_2_1/base/src/macports1.0/macports.tcl 2012-12-04 00:44:27 UTC (rev 100222) +++ branches/release_2_1/base/src/macports1.0/macports.tcl 2012-12-04 00:50:31 UTC (rev 100223) @@ -4342,8 +4342,8 @@ } if {[llength $result] < 2} { ui_warn "No port $portname found in the index; can't rebuild" - unset broken_files_by_port($port) - continue + ui_warn "Either your portindex is corrupt or $portname has been removed; consider uninstalling it." + error "Port $portname not found in index" } } if {![info exists broken_port_counts($portname)]} { Modified: branches/release_2_1/base/src/registry2.0/portuninstall.tcl =================================================================== --- branches/release_2_1/base/src/registry2.0/portuninstall.tcl 2012-12-04 00:44:27 UTC (rev 100222) +++ branches/release_2_1/base/src/registry2.0/portuninstall.tcl 2012-12-04 00:50:31 UTC (rev 100223) @@ -217,7 +217,9 @@ # files so just ignore the failure catch {file delete [::file dirname $imagefile]} - registry::entry delete $port + registry::write { + registry::entry delete $port + } } # uninstall dependencies if requested

1 0

[100222] trunk/base/ChangeLog
by cal＠macports.org 04 Dec '12

04 Dec '12

Revision: 100222 https://trac.macports.org/changeset/100222 Author: cal(a)macports.org Date: 2012-12-03 16:44:27 -0800 (Mon, 03 Dec 2012) Log Message: ----------- Update ChangeLog for my recent darwintrace changes Modified Paths: -------------- trunk/base/ChangeLog Modified: trunk/base/ChangeLog =================================================================== --- trunk/base/ChangeLog 2012-12-04 00:39:01 UTC (rev 100221) +++ trunk/base/ChangeLog 2012-12-04 00:44:27 UTC (rev 100222) @@ -9,6 +9,10 @@ the list of subports of the given port name (raimue in r100059) + - Fixes brining trace mode back to a working state. Improvements to reduce + the number of builds trace mode breaks. + (cal in r100071-100073, r100077, r100126, r100221) + Release 2.1.3 (unreleased) - Fixed a bug where a certain order of starting and aborting a build, running selfupdate and continuing a build would resume building although

1 0

[100221] trunk/base/src/darwintracelib1.0/darwintrace.c
by cal＠macports.org 04 Dec '12

04 Dec '12

Revision: 100221 https://trac.macports.org/changeset/100221 Author: cal(a)macports.org Date: 2012-12-03 16:39:01 -0800 (Mon, 03 Dec 2012) Log Message: ----------- darwintrace: make the darwintrace FD a moving target, hide files rather than denying access Move the darwintrace file descriptor when somebody tries dup2(2)'ing over it. This is better compared to the previous solution using a fixed high-number FD because it doesn't break software actually using this FD number. Also hide files rather than denying access where possible by setting errno to ENOENT rather than EACCES where the standards allow this. Modified Paths: -------------- trunk/base/src/darwintracelib1.0/darwintrace.c Modified: trunk/base/src/darwintracelib1.0/darwintrace.c =================================================================== --- trunk/base/src/darwintracelib1.0/darwintrace.c 2012-12-04 00:30:12 UTC (rev 100220) +++ trunk/base/src/darwintracelib1.0/darwintrace.c 2012-12-04 00:39:01 UTC (rev 100221) @@ -144,7 +144,6 @@ inline void __darwintrace_cleanup_path(char *path); static char * exchange_with_port(const char * buf, size_t len, int answer); -#define DT_STATIC_FD_NUM (236) static int __darwintrace_fd = -2; static FILE *__darwintrace_debug = NULL; static pid_t __darwintrace_pid = (pid_t) -1; @@ -362,12 +361,6 @@ if (__env_darwintrace_log != NULL) { int olderrno = errno; int sock = socket(AF_UNIX, SOCK_STREAM, 0); - if (-1 == dup2(sock, DT_STATIC_FD_NUM)) { - debug_printf("couldn't duplicate filedescriptor into %d", DT_STATIC_FD_NUM); - abort(); - } - close(sock); - sock = DT_STATIC_FD_NUM; struct sockaddr_un sun; sun.sun_family = AF_UNIX; strncpy(sun.sun_path, __env_darwintrace_log, sizeof(sun.sun_path)); @@ -499,10 +492,13 @@ int result = 0; struct stat st; + debug_printf("ask_for_dependency: %s\n", path); + if (-1 == stat(path, &st)) { return 1; } if (S_ISDIR(st.st_mode)) { + debug_printf("%s is directory\n", path); return 1; } @@ -692,7 +688,7 @@ *newpath = '\0'; if (!__darwintrace_is_in_sandbox(path, newpath)) { debug_printf("open %s was forbidden\n", path); - errno = EACCES; + errno = ((flags & O_CREAT) > 0) ? EACCES : ENOENT; return -1; } @@ -725,7 +721,7 @@ *newpath = '\0'; if (!__darwintrace_is_in_sandbox(path, newpath)) { - errno = EACCES; + errno = ENOENT; return -1; } @@ -839,8 +835,18 @@ debug_printf("dup2(%d, %d)\n", filedes, filedes2); if (__darwintrace_fd != -2 && filedes2 == __darwintrace_fd) { - errno = EBADF; - return -1; + /* if somebody tries to close our file descriptor, just move it out of + * the way. Make sure it doesn't end up as stdin/stdout/stderr, though! + * */ + int new_darwintrace_fd; + + if (-1 == (new_darwintrace_fd = fcntl(__darwintrace_fd, F_DUPFD, STDOUT_FILENO + 1))) { + /* if duplicating fails, do not allow overwriting either! */ + return -1; + } + + debug_printf("moving __darwintrace_fd from %d to %d\n", __darwintrace_fd, new_darwintrace_fd); + __darwintrace_fd = new_darwintrace_fd; } return dup2(filedes, filedes2); @@ -856,7 +862,7 @@ *newpath = '\0'; if (!__darwintrace_is_in_sandbox(path, newpath)) { debug_printf("unlink %s was forbidden\n", path); - errno = EACCES; + errno = ENOENT; return -1; } @@ -905,7 +911,7 @@ #define __rmdir(x) syscall(SYS_rmdir, (x)) if (!__darwintrace_is_in_sandbox(path, NULL)) { debug_printf("removing directory %s was forbidden\n", path); - errno = EACCES; + errno = ENOENT; return -1; } @@ -921,7 +927,7 @@ if (!__darwintrace_is_in_sandbox(from, NULL)) { /* outside sandbox, forbid */ debug_printf("renaming from %s was forbidden\n", from); - errno = EACCES; + errno = ENOENT; return -1; } if (!__darwintrace_is_in_sandbox(to, NULL)) {

1 0

[100220] trunk/base/ChangeLog
by cal＠macports.org 04 Dec '12

04 Dec '12

Revision: 100220 https://trac.macports.org/changeset/100220 Author: cal(a)macports.org Date: 2012-12-03 16:30:12 -0800 (Mon, 03 Dec 2012) Log Message: ----------- Update ChangeLog for my recent base commits Modified Paths: -------------- trunk/base/ChangeLog Modified: trunk/base/ChangeLog =================================================================== --- trunk/base/ChangeLog 2012-12-04 00:21:25 UTC (rev 100219) +++ trunk/base/ChangeLog 2012-12-04 00:30:12 UTC (rev 100220) @@ -19,6 +19,22 @@ ccache >= 3.1.7 by running the initialization step as the macportsuser. (raimue in r97868) + - Fix an endless loop that could be triggered in rev-upgrade when a user + hasn't run selfupdate in more than a year or the portindex is corrupt. + (cal in r100129) + + - Set a busy timeout on SQLite connections to prevent MacPorts from + uselessly burning CPU cycles when waiting for a database lock. + (cal in r100217) + + - Switch from exclusive locking to immediate locking in the registry + database to avoid locking reads where not needed. + (cal in r100218) + + - Fix a problem where interrupting the uninstallation process could leave + the registry database in a corrupted state. + (cal in r100219) + Release 2.1.2 (2012-07-26 by jmr): - Fixed autodetection of developer_dir with Xcode 4.4 (#35150, mfeiri in r95552)

1 0

[100219] trunk/base/src/registry2.0/portuninstall.tcl
by cal＠macports.org 04 Dec '12

04 Dec '12

Revision: 100219 https://trac.macports.org/changeset/100219 Author: cal(a)macports.org Date: 2012-12-03 16:21:25 -0800 (Mon, 03 Dec 2012) Log Message: ----------- registry: wrap removing files from the registry in a transaction, closes #34482 When uninstall operations are interuppted manually, this could cause a problem hard to solve (for end users). See #34482, "an invalid entry was passed". Wrapping the deletions in a transaction prevents this, because the records will either be deleted completely, or not at all. Modified Paths: -------------- trunk/base/src/registry2.0/portuninstall.tcl Modified: trunk/base/src/registry2.0/portuninstall.tcl =================================================================== --- trunk/base/src/registry2.0/portuninstall.tcl 2012-12-04 00:17:26 UTC (rev 100218) +++ trunk/base/src/registry2.0/portuninstall.tcl 2012-12-04 00:21:25 UTC (rev 100219) @@ -217,7 +217,9 @@ # files so just ignore the failure catch {file delete [::file dirname $imagefile]} - registry::entry delete $port + registry::write { + registry::entry delete $port + } } # uninstall dependencies if requested

1 0

[100218] trunk/base/src/cregistry/registry.c
by cal＠macports.org 04 Dec '12

04 Dec '12

Revision: 100218 https://trac.macports.org/changeset/100218 Author: cal(a)macports.org Date: 2012-12-03 16:17:26 -0800 (Mon, 03 Dec 2012) Log Message: ----------- registry: use BEGIN IMMEDIATE rather than BEGIN EXCLUSIVE The only difference between BEGIN IMMEDIATE and BEGIN EXCLUSIVE is that the latter immediately blocks ready access for all clients, while the former only does that when needed. Modified Paths: -------------- trunk/base/src/cregistry/registry.c Modified: trunk/base/src/cregistry/registry.c =================================================================== --- trunk/base/src/cregistry/registry.c 2012-12-04 00:12:26 UTC (rev 100217) +++ trunk/base/src/cregistry/registry.c 2012-12-04 00:17:26 UTC (rev 100218) @@ -366,7 +366,7 @@ * @return true if success; false if failure */ int reg_start_write(reg_registry* reg, reg_error* errPtr) { - if (reg_start(reg, "BEGIN EXCLUSIVE", errPtr)) { + if (reg_start(reg, "BEGIN IMMEDIATE", errPtr)) { reg->status |= reg_transacting | reg_can_write; return 1; } else {

1 0