[92937] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Fri May 11 07:01:56 PDT 2012
Revision: 92937
https://trac.macports.org/changeset/92937
Author: ryandesign at macports.org
Date: 2012-05-11 07:01:55 -0700 (Fri, 11 May 2012)
Log Message:
-----------
check that files have no owner before deleting
Modified Paths:
--------------
trunk/dports/aqua/mumble/Portfile
trunk/dports/databases/gdbm/Portfile
trunk/dports/devel/ocaml-json-wheel/Portfile
trunk/dports/emulators/lisaem/Portfile
trunk/dports/lang/clang-2.9/Portfile
trunk/dports/lang/clang-3.0/Portfile
trunk/dports/lang/clang-3.1/Portfile
trunk/dports/lang/clang-3.2/Portfile
trunk/dports/science/cgnslib/Portfile
Modified: trunk/dports/aqua/mumble/Portfile
===================================================================
--- trunk/dports/aqua/mumble/Portfile 2012-05-11 13:23:29 UTC (rev 92936)
+++ trunk/dports/aqua/mumble/Portfile 2012-05-11 14:01:55 UTC (rev 92937)
@@ -89,7 +89,7 @@
# ${prefix}${applications_dir}; remove them if found
foreach file {Mumble.app} {
set filepath ${prefix}${applications_dir}/${file}
- if {[file exists ${filepath}]} {
+ if {[file exists ${filepath}] && [registry_file_registered ${filepath}] == "0"} {
if {[catch {delete ${filepath}}]} {
ui_warn "Cannot delete ${filepath}; please remove it manually"
}
Modified: trunk/dports/databases/gdbm/Portfile
===================================================================
--- trunk/dports/databases/gdbm/Portfile 2012-05-11 13:23:29 UTC (rev 92936)
+++ trunk/dports/databases/gdbm/Portfile 2012-05-11 14:01:55 UTC (rev 92937)
@@ -36,7 +36,7 @@
# gdbm @1.8.3_1 installed files outside the destroot; remove them if found
foreach file {share/info/gdbm.info share/man/man3/gdbm.3} {
set filepath ${prefix}/${file}
- if {[file exists ${filepath}]} {
+ if {[file exists ${filepath}] && [registry_file_registered ${filepath}] == "0"} {
if {[catch {delete ${filepath}}]} {
ui_warn "Cannot delete ${filepath}; please remove it manually"
}
Modified: trunk/dports/devel/ocaml-json-wheel/Portfile
===================================================================
--- trunk/dports/devel/ocaml-json-wheel/Portfile 2012-05-11 13:23:29 UTC (rev 92936)
+++ trunk/dports/devel/ocaml-json-wheel/Portfile 2012-05-11 14:01:55 UTC (rev 92937)
@@ -51,7 +51,7 @@
pre-activate {
# caml-json-wheel 1.0.6_0 installed an item in ${prefix}/bin; remove it if found
set filepath ${prefix}/bin/jsoncat
- if {[file exists ${filepath}]} {
+ if {[file exists ${filepath}] && [registry_file_registered ${filepath}] == "0"} {
if {[catch {delete ${filepath}}]} {
ui_warn "Cannot delete ${filepath}; please remove it manually"
}
Modified: trunk/dports/emulators/lisaem/Portfile
===================================================================
--- trunk/dports/emulators/lisaem/Portfile 2012-05-11 13:23:29 UTC (rev 92936)
+++ trunk/dports/emulators/lisaem/Portfile 2012-05-11 14:01:55 UTC (rev 92937)
@@ -50,7 +50,7 @@
# lisaem 1.2.6_0 installed items to /usr/local/bin; remove them if found
foreach file {lisadiskinfo lisafsh-tool} {
set filepath /usr/local/bin/${file}
- if {[file exists ${filepath}]} {
+ if {[file exists ${filepath}] && [registry_file_registered ${filepath}] == "0"} {
if {[catch {delete ${filepath}}]} {
ui_warn "Cannot delete ${filepath}; please remove it manually"
}
Modified: trunk/dports/lang/clang-2.9/Portfile
===================================================================
--- trunk/dports/lang/clang-2.9/Portfile 2012-05-11 13:23:29 UTC (rev 92936)
+++ trunk/dports/lang/clang-2.9/Portfile 2012-05-11 14:01:55 UTC (rev 92937)
@@ -218,9 +218,10 @@
pre-activate {
# An earlier version of this port accidentally installed ${sub_prefix}/bin/ld
# rather than ${destroot}${sub_prefix}/bin/ld
- if {[file exists ${sub_prefix}/bin/ld]} {
- if {[catch {delete ${sub_prefix}/bin/ld}]} {
- ui_warn "Cannot delete ${sub_prefix}/bin/ld; please remove it manually."
- }
+ set filepath ${sub_prefix}/bin/ld
+ if {[file exists ${filepath}] && [registry_file_registered ${filepath}] == "0"} {
+ if {[catch {delete ${filepath}}]} {
+ ui_warn "Cannot delete ${filepath}; please remove it manually"
+ }
}
}
Modified: trunk/dports/lang/clang-3.0/Portfile
===================================================================
--- trunk/dports/lang/clang-3.0/Portfile 2012-05-11 13:23:29 UTC (rev 92936)
+++ trunk/dports/lang/clang-3.0/Portfile 2012-05-11 14:01:55 UTC (rev 92937)
@@ -216,9 +216,10 @@
pre-activate {
# An earlier version of this port accidentally installed ${sub_prefix}/bin/ld
# rather than ${destroot}${sub_prefix}/bin/ld
- if {[file exists ${sub_prefix}/bin/ld]} {
- if {[catch {delete ${sub_prefix}/bin/ld}]} {
- ui_warn "Cannot delete ${sub_prefix}/bin/ld; please remove it manually."
- }
+ set filepath ${sub_prefix}/bin/ld
+ if {[file exists ${filepath}] && [registry_file_registered ${filepath}] == "0"} {
+ if {[catch {delete ${filepath}}]} {
+ ui_warn "Cannot delete ${filepath}; please remove it manually"
+ }
}
}
Modified: trunk/dports/lang/clang-3.1/Portfile
===================================================================
--- trunk/dports/lang/clang-3.1/Portfile 2012-05-11 13:23:29 UTC (rev 92936)
+++ trunk/dports/lang/clang-3.1/Portfile 2012-05-11 14:01:55 UTC (rev 92937)
@@ -216,9 +216,10 @@
pre-activate {
# An earlier version of this port accidentally installed ${sub_prefix}/bin/ld
# rather than ${destroot}${sub_prefix}/bin/ld
- if {[file exists ${sub_prefix}/bin/ld]} {
- if {[catch {delete ${sub_prefix}/bin/ld}]} {
- ui_warn "Cannot delete ${sub_prefix}/bin/ld; please remove it manually."
- }
+ set filepath ${sub_prefix}/bin/ld
+ if {[file exists ${filepath}] && [registry_file_registered ${filepath}] == "0"} {
+ if {[catch {delete ${filepath}}]} {
+ ui_warn "Cannot delete ${filepath}; please remove it manually"
+ }
}
}
Modified: trunk/dports/lang/clang-3.2/Portfile
===================================================================
--- trunk/dports/lang/clang-3.2/Portfile 2012-05-11 13:23:29 UTC (rev 92936)
+++ trunk/dports/lang/clang-3.2/Portfile 2012-05-11 14:01:55 UTC (rev 92937)
@@ -211,9 +211,10 @@
pre-activate {
# An earlier version of this port accidentally installed ${sub_prefix}/bin/ld
# rather than ${destroot}${sub_prefix}/bin/ld
- if {[file exists ${sub_prefix}/bin/ld]} {
- if {[catch {delete ${sub_prefix}/bin/ld}]} {
- ui_warn "Cannot delete ${sub_prefix}/bin/ld; please remove it manually."
- }
+ set filepath ${sub_prefix}/bin/ld
+ if {[file exists ${filepath}] && [registry_file_registered ${filepath}] == "0"} {
+ if {[catch {delete ${filepath}}]} {
+ ui_warn "Cannot delete ${filepath}; please remove it manually"
+ }
}
}
Modified: trunk/dports/science/cgnslib/Portfile
===================================================================
--- trunk/dports/science/cgnslib/Portfile 2012-05-11 13:23:29 UTC (rev 92936)
+++ trunk/dports/science/cgnslib/Portfile 2012-05-11 14:01:55 UTC (rev 92937)
@@ -58,7 +58,7 @@
# cgnslib 2.5.4_0 installed items directly in ${prefix}; remove them if found
foreach file {include/cgnslib.h include/cgnslib_f.h include/cgnswin_f.h lib/libcgns.a} {
set filepath ${prefix}/${file}
- if {[file exists ${filepath}]} {
+ if {[file exists ${filepath}] && [registry_file_registered ${filepath}] == "0"} {
if {[catch {delete ${filepath}}]} {
ui_warn "Cannot delete ${filepath}; please remove it manually"
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120511/7dbeebaa/attachment.html>
More information about the macports-changes
mailing list