summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2006-12-25 05:27:45 +0000
committerAlec Warner <antarus@gentoo.org>2006-12-25 05:27:45 +0000
commitd65a3d116c7fe90b8332a994b7456b3ebb236ee2 (patch)
treefff277f610d564cdbae5966346ff8c22d92ef894
parent4343fbef79335369313538a07e67db2210e2b516 (diff)
downloadportage-d65a3d116c7fe90b8332a994b7456b3ebb236ee2.tar.gz
portage-d65a3d116c7fe90b8332a994b7456b3ebb236ee2.tar.bz2
portage-d65a3d116c7fe90b8332a994b7456b3ebb236ee2.zip
Docstrings for mergeme...
svn path=/main/trunk/; revision=5386
-rw-r--r--pym/portage.py26
1 files changed, 26 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py
index b3eb4a581..cb6ce4de4 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -7094,6 +7094,32 @@ class dblink:
return 0
def mergeme(self,srcroot,destroot,outfile,secondhand,stufftomerge,cfgfiledict,thismtime):
+ """
+
+ This function handles actual merging of the package contents to the livefs.
+ It also handles config protection.
+
+ @param srcroot: Where are we copying files from (usually ${D})
+ @type srcroot: String (Path)
+ @param destroot: Typically ${ROOT}
+ @type destroot: String (Path)
+ @param outfile: File to log operations to
+ @type outfile: File Object
+ @param secondhand: A set of items to merge in pass two (usually
+ or symlinks that point to non-existing files that may get merged later)
+ @type secondhand: List
+ @param stufftomerge: Either a diretory to merge, or a list of items.
+ @type stufftomerge: String or List
+ @param cfgfiledict: { File:mtime } mapping for config_protected files
+ @type cfgfiledict: Dictionary
+ @param thismtime: The current time (typically long(time.time())
+ @type thismtime: Long
+ @rtype: None or Boolean
+ @returns:
+ 1. True on failure
+ 2. None otherwise
+
+ """
from os.path import sep, join
srcroot = normalize_path(srcroot).rstrip(sep) + sep
destroot = normalize_path(destroot).rstrip(sep) + sep