From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-357817-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QazZa-00083O-ME
for garchives@archives.gentoo.org; Mon, 27 Jun 2011 00:21:06 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1CB0A1C09C;
Mon, 27 Jun 2011 00:20:59 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id CEEC91C09C
for <gentoo-commits@lists.gentoo.org>; Mon, 27 Jun 2011 00:20:58 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 5FA1F1BC019
for <gentoo-commits@lists.gentoo.org>; Mon, 27 Jun 2011 00:20:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id B548A8003C
for <gentoo-commits@lists.gentoo.org>; Mon, 27 Jun 2011 00:20:57 +0000 (UTC)
From: "Wiktor W Brodlo" <wiktor@brodlo.net>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Wiktor W Brodlo" <wiktor@brodlo.net>
Message-ID: <4e1d8fe93b557b161cb75b6289b2aeed541fab32.wiktor@gentoo>
Subject: [gentoo-commits] proj/anaconda:master commit in: gentoo/
X-VCS-Repository: proj/anaconda
X-VCS-Files: gentoo/utils.py
X-VCS-Directories: gentoo/
X-VCS-Committer: wiktor
X-VCS-Committer-Name: Wiktor W Brodlo
X-VCS-Revision: 4e1d8fe93b557b161cb75b6289b2aeed541fab32
Date: Mon, 27 Jun 2011 00:20:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 3a5b970d41a8202d7642be575e2eba32
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=3Dproj/anaconda.git;=
a=3Dcommit;h=3D4e1d8fe9
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
=20
- 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()
=20
tofile =3D self._root + currentfile
st_info =3D os.lstat(fromfile)
@@ -937,22 +937,22 @@ class GentooInstall:
while 1:
change =3D False
mydirs =3D set()
- try:
- mydirs =3D self._files_db.retrieveContent(None, contentT=
ype =3D "dir")
- except TypeError:
- mydirs =3D set([x for x, y in self._files_db.retrieveCon=
tent(None,
- extended =3D True) if y =3D=3D "dir"])
- for mydir in mydirs:
- mytree =3D os.path.join(self._root,mydir)
- if os.path.isdir(mytree) and not client_repo.isFileAvail=
able(
- mydir):
- try:
- os.rmdir(mytree)
- change =3D True
- except OSError:
- pass
- if not change:
- break
+ #try:
+ # mydirs =3D self._files_db.retrieveContent(None, content=
Type =3D "dir")
+ #except TypeError:
+ # mydirs =3D set([x for x, y in self._files_db.retrieveCo=
ntent(None,
+ # extended =3D True) if y =3D=3D "dir"])
+ #for mydir in mydirs:
+ # mytree =3D os.path.join(self._root,mydir)
+ # if os.path.isdir(mytree) and not client_repo.isFileAvai=
lable(
+ # mydir):
+ # try:
+ # os.rmdir(mytree)
+ # change =3D True
+ # except OSError:
+ # pass
+ #if not change:
+ # break
=20
# We don't do that on Gentoo
# list installed packages and setup a package set