Changeset 79300

Timestamp:

06/08/11 17:01:05 (4 years ago)

Author:

fotanus@…

Message:

Changed postdestroot phase name for checkdestroot

Avoids confusion for the name

Location:

branches/gsoc11-post-destroot/base/src/port1.0

Files:

• Makefile (modified) (1 diff)
• port.tcl (modified) (1 diff)
• portcheckdestroot.tcl (moved) (moved from branches/gsoc11-post-destroot/base/src/port1.0/portpostdestroot.tcl) (6 diffs)
• portinstall.tcl (modified) (1 diff)

branches/gsoc11-post-destroot/base/src/port1.0/Makefile

@@ -8 +8 @@
         porttrace.tcl portlivecheck.tcl portdistcheck.tcl portmirror.tcl \
         portload.tcl portunload.tcl portdistfiles.tcl fetch_common.tcl \
-        portpostdestroot.tcl
+        portcheckdestroot.tcl
 
 include ../../Mk/macports.subdir.mk

branches/gsoc11-post-destroot/base/src/port1.0/port.tcl

@@ -43 +43 @@
 package require portbuild 1.0
 package require portdestroot 1.0
-package require portpostdestroot 1.0
+package require portcheckdestroot 1.0
 package require portinstall 1.0
 package require portuninstall 1.0

branches/gsoc11-post-destroot/base/src/port1.0/portcheckdestroot.tcl

@@ -1 +1 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
-# portpostdestroot.tcl
+# portcheckdestroot.tcl
 
-package provide portpostdestroot 1.0
+package provide portcheckdestroot 1.0
 package require portutil 1.0
 
-set org.macports.postdestroot [target_new org.macports.postdestroot portpostdestroot::postdestroot_main]
-target_provides ${org.macports.postdestroot} postdestroot
-target_requires ${org.macports.postdestroot} main destroot
-target_prerun ${org.macports.postdestroot} portpostdestroot::postdestroot_start
+set org.macports.checkdestroot [target_new org.macports.checkdestroot portcheckdestroot::checkdestroot_main]
+target_provides ${org.macports.checkdestroot} checkdestroot
+target_requires ${org.macports.checkdestroot} main destroot
+target_prerun ${org.macports.checkdestroot} portcheckdestroot::checkdestroot_start
 
-namespace eval portpostdestroot {
+namespace eval portcheckdestroot {
 }
 
@@ -22 +22 @@
 
 
-# Starting procedure from postdestroot phase. Check for permissions.
-proc portpostdestroot::postdestroot_start {args} {
+# Starting procedure from checkdestroot phase. Check for permissions.
+proc portcheckdestroot::checkdestroot_start {args} {
     if { [getuid] == 0 && [geteuid] != 0 } {
         # if started with sudo but have dropped the privileges
@@ -36 +36 @@
 
 # List all links on a directory recursively. This function is for internal use.
-proc portpostdestroot::links_list {dir} {
+proc portcheckdestroot::links_list {dir} {
     set ret {}
     foreach item [glob -nocomplain -type {d l} -directory $dir *] {
@@ -50 +50 @@
 
 # Check for errors on port symlinks
-proc portpostdestroot::postdestroot_symlink_check {} {
+proc portcheckdestroot::checkdestroot_symlink_check {} {
     global UI_PREFIX destroot prefix
     ui_notice "$UI_PREFIX Checking for links"
@@ -78 +78 @@
 
 # Check for erros that violates the macports directory tree.
-proc portpostdestroot::postdestroot_mtree_check {} {
+proc portcheckdestroot::checkdestroot_mtree_check {} {
 
     global destroot prefix portsharepath destroot.violate_mtree
@@ -161 +161 @@
 }
 
-proc portpostdestroot::postdestroot_main {args} {
+proc portcheckdestroot::checkdestroot_main {args} {
     global UI_PREFIX
-    ui_notice "$UI_PREFIX Executing post-destroot phase"
+    ui_notice "$UI_PREFIX Executing check-destroot phase"
 
-    postdestroot_symlink_check
-    postdestroot_mtree_check
+    checkdestroot_symlink_check
+    checkdestroot_mtree_check
     return 0
 }

branches/gsoc11-post-destroot/base/src/port1.0/portinstall.tcl

@@ -39 +39 @@
 target_provides ${org.macports.install} install
 target_runtype ${org.macports.install} always
-target_requires ${org.macports.install} main archivefetch fetch checksum extract patch configure build destroot postdestroot
+target_requires ${org.macports.install} main archivefetch fetch checksum extract patch configure build destroot checkdestroot
 target_prerun ${org.macports.install} portinstall::install_start