[gentoo-commits] proj/anaconda:master commit in: gentoo/

["Wiktor W Brodlo" <wiktor@brodlo.net>]

commit:     4e1d8fe93b557b161cb75b6289b2aeed541fab32
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jun 27 00:20:33 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jun 27 00:20:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=4e1d8fe9

gentoo/utils.py: more cruft (_files_db references)

---
 gentoo/utils.py |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/gentoo/utils.py b/gentoo/utils.py
index ba3ddd1..1931aff 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -866,14 +866,14 @@ class GentooInstall:
                 if currentfile.startswith("/dev/"):
                     continue
 
-                try:
+                #try:
                     # if file is in the ignore list
-                    if self._files_db.isFileAvailable(
-                        currentfile.decode('raw_unicode_escape')):
-                        continue
-                except:
-                    import traceback
-                    traceback.print_exc()
+                #    if self._files_db.isFileAvailable(
+                #        currentfile.decode('raw_unicode_escape')):
+                #        continue
+                #except:
+                #    import traceback
+                #    traceback.print_exc()
 
                 tofile = self._root + currentfile
                 st_info = os.lstat(fromfile)
@@ -937,22 +937,22 @@ class GentooInstall:
         while 1:
             change = False
             mydirs = set()
-            try:
-                mydirs = self._files_db.retrieveContent(None, contentType = "dir")
-            except TypeError:
-                mydirs = set([x for x, y in self._files_db.retrieveContent(None,
-                    extended = True) if y == "dir"])
-            for mydir in mydirs:
-                mytree = os.path.join(self._root,mydir)
-                if os.path.isdir(mytree) and not client_repo.isFileAvailable(
-                    mydir):
-                    try:
-                        os.rmdir(mytree)
-                        change = True
-                    except OSError:
-                        pass
-            if not change:
-                break
+            #try:
+            #    mydirs = self._files_db.retrieveContent(None, contentType = "dir")
+            #except TypeError:
+            #    mydirs = set([x for x, y in self._files_db.retrieveContent(None,
+            #        extended = True) if y == "dir"])
+            #for mydir in mydirs:
+            #    mytree = os.path.join(self._root,mydir)
+            #    if os.path.isdir(mytree) and not client_repo.isFileAvailable(
+            #        mydir):
+            #        try:
+            #            os.rmdir(mytree)
+            #            change = True
+            #        except OSError:
+            #            pass
+            #if not change:
+            #    break
 
         # We don't do that on Gentoo
         # list installed packages and setup a package set