| 1 |
commit: 4e1d8fe93b557b161cb75b6289b2aeed541fab32 |
| 2 |
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net> |
| 3 |
AuthorDate: Mon Jun 27 00:20:33 2011 +0000 |
| 4 |
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net> |
| 5 |
CommitDate: Mon Jun 27 00:20:33 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=4e1d8fe9 |
| 7 |
|
| 8 |
gentoo/utils.py: more cruft (_files_db references) |
| 9 |
|
| 10 |
--- |
| 11 |
gentoo/utils.py | 46 +++++++++++++++++++++++----------------------- |
| 12 |
1 files changed, 23 insertions(+), 23 deletions(-) |
| 13 |
|
| 14 |
diff --git a/gentoo/utils.py b/gentoo/utils.py |
| 15 |
index ba3ddd1..1931aff 100644 |
| 16 |
--- a/gentoo/utils.py |
| 17 |
+++ b/gentoo/utils.py |
| 18 |
@@ -866,14 +866,14 @@ class GentooInstall: |
| 19 |
if currentfile.startswith("/dev/"): |
| 20 |
continue |
| 21 |
|
| 22 |
- try: |
| 23 |
+ #try: |
| 24 |
# if file is in the ignore list |
| 25 |
- if self._files_db.isFileAvailable( |
| 26 |
- currentfile.decode('raw_unicode_escape')): |
| 27 |
- continue |
| 28 |
- except: |
| 29 |
- import traceback |
| 30 |
- traceback.print_exc() |
| 31 |
+ # if self._files_db.isFileAvailable( |
| 32 |
+ # currentfile.decode('raw_unicode_escape')): |
| 33 |
+ # continue |
| 34 |
+ #except: |
| 35 |
+ # import traceback |
| 36 |
+ # traceback.print_exc() |
| 37 |
|
| 38 |
tofile = self._root + currentfile |
| 39 |
st_info = os.lstat(fromfile) |
| 40 |
@@ -937,22 +937,22 @@ class GentooInstall: |
| 41 |
while 1: |
| 42 |
change = False |
| 43 |
mydirs = set() |
| 44 |
- try: |
| 45 |
- mydirs = self._files_db.retrieveContent(None, contentType = "dir") |
| 46 |
- except TypeError: |
| 47 |
- mydirs = set([x for x, y in self._files_db.retrieveContent(None, |
| 48 |
- extended = True) if y == "dir"]) |
| 49 |
- for mydir in mydirs: |
| 50 |
- mytree = os.path.join(self._root,mydir) |
| 51 |
- if os.path.isdir(mytree) and not client_repo.isFileAvailable( |
| 52 |
- mydir): |
| 53 |
- try: |
| 54 |
- os.rmdir(mytree) |
| 55 |
- change = True |
| 56 |
- except OSError: |
| 57 |
- pass |
| 58 |
- if not change: |
| 59 |
- break |
| 60 |
+ #try: |
| 61 |
+ # mydirs = self._files_db.retrieveContent(None, contentType = "dir") |
| 62 |
+ #except TypeError: |
| 63 |
+ # mydirs = set([x for x, y in self._files_db.retrieveContent(None, |
| 64 |
+ # extended = True) if y == "dir"]) |
| 65 |
+ #for mydir in mydirs: |
| 66 |
+ # mytree = os.path.join(self._root,mydir) |
| 67 |
+ # if os.path.isdir(mytree) and not client_repo.isFileAvailable( |
| 68 |
+ # mydir): |
| 69 |
+ # try: |
| 70 |
+ # os.rmdir(mytree) |
| 71 |
+ # change = True |
| 72 |
+ # except OSError: |
| 73 |
+ # pass |
| 74 |
+ #if not change: |
| 75 |
+ # break |
| 76 |
|
| 77 |
# We don't do that on Gentoo |
| 78 |
# list installed packages and setup a package set |
Archives