From 35e09c1a73bd5865a708a4c45c9c48e5f70a6f13 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 15 Jul 2006 19:09:11 +0000
Subject: [PATCH] Remove the portage_file module for bug #133591.

svn path=/main/trunk/; revision=3892
---
 pym/eclass_cache.py  |  9 +++----
 pym/portage_file.py  | 62 --------------------------------------------
 pym/portage_locks.py |  3 +--
 3 files changed, 5 insertions(+), 69 deletions(-)
 delete mode 100644 pym/portage_file.py

diff --git a/pym/eclass_cache.py b/pym/eclass_cache.py
index 066162611..1847cbf76 100644
--- a/pym/eclass_cache.py
+++ b/pym/eclass_cache.py
@@ -1,10 +1,9 @@
 # Copyright: 2005 Gentoo Foundation
 # Author(s): Nicholas Carpaski (carpaski@gentoo.org), Brian Harring (ferringb@gentoo.org)
 # License: GPL2
-# $Id:$
+# $Id$
 
-from portage_util import writemsg
-import portage_file
+from portage_util import normalize_path, writemsg
 import os, sys
 from portage_data import portage_gid
 
@@ -20,7 +19,7 @@ class cache:
 		# screw with the porttree ordering, w/out having bash inherit match it, and I'll hurt you.
 		# ~harring
 		self.porttrees = [self.porttree_root]+overlays
-		self.porttrees = tuple(map(portage_file.normpath, self.porttrees))
+		self.porttrees = tuple(map(normalize_path, self.porttrees))
 		self._master_eclass_root = os.path.join(self.porttrees[0],"eclass")
 		self.update_eclasses()
 
@@ -40,7 +39,7 @@ class cache:
 	def update_eclasses(self):
 		self.eclasses = {}
 		eclass_len = len(".eclass")
-		for x in [portage_file.normpath(os.path.join(y,"eclass")) for y in self.porttrees]:
+		for x in [normalize_path(os.path.join(y,"eclass")) for y in self.porttrees]:
 			if not os.path.isdir(x):
 				continue
 			for y in [y for y in os.listdir(x) if y.endswith(".eclass")]:
diff --git a/pym/portage_file.py b/pym/portage_file.py
deleted file mode 100644
index 711ba098b..000000000
--- a/pym/portage_file.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# portage_data.py -- Calculated/Discovered Data Values
-# Copyright 1998-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-
-import os
-import portage_data
-import portage_exception
-from portage_localization import _
-
-def normpath(mypath):
-	newpath = os.path.normpath(mypath)
-	if len(newpath) > 1:
-		if newpath[:2] == "//":
-			newpath = newpath[1:]
-	return newpath
-								
-
-def makedirs(path, perms=0755, uid=None, gid=None, must_chown=False):
-	old_umask = os.umask(0)
-	if(uid is None):
-		uid = portage_data.portage_uid
-	if(gid is None):
-		gid = portage_data.portage_gid
-	if not path:
-		raise portage_exception.InvalidParameter, _("Invalid path: type: '%(type)s' value: '%(path)s'") % {"path": path, "type": type(path)}
-	if(perm > 1535) or (perm == 0):
-		raise portage_exception.InvalidParameter, _("Invalid permissions passed. Value is octal and no higher than 02777.")
-
-	mypath = normpath(path)
-	dirs = string.split(path, "/")
-	
-	mypath = ""
-	if dirs and dirs[0] == "":
-		mypath = "/"
-		dirs = dirs[1:]
-	for x in dirs:
-		mypath += x+"/"
-		if not os.path.exists(mypath):
-			os.mkdir(mypath, perm)
-			try:
-				os.chown(mypath, uid, gid)
-			except SystemExit, e:
-				raise
-			except:
-				if must_chown:
-					os.umask(old_umask)
-					raise
-				portage_util.writemsg(_("Failed to chown: %(path)s to %(uid)s:%(gid)s\n") % {"path":mypath,"uid":uid,"gid":gid})
-
-	os.umask(old_umask)
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
diff --git a/pym/portage_locks.py b/pym/portage_locks.py
index 027399a02..4a61f6312 100644
--- a/pym/portage_locks.py
+++ b/pym/portage_locks.py
@@ -11,7 +11,6 @@ import string
 import time
 import types
 import portage_exception
-import portage_file
 import portage_util
 import portage_data
 from portage_exec import atexit_register
@@ -24,7 +23,7 @@ def clean_my_hardlocks():
 	for x in hardlock_path_list:
 		hardlock_cleanup(x)
 def add_hardlock_file_to_cleanup(path):
-	mypath = portage_file.normpath(path)
+	mypath = portage_util.normalize_path(path)
 	if os.path.isfile(mypath):
 		mypath = os.path.dirname(mypath)
 	if os.path.isdir(mypath):
-- 
2.26.2