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 ) id 1Qk0Fg-0008Gr-3v for garchives@archives.gentoo.org; Thu, 21 Jul 2011 20:53:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A924921C44E; Thu, 21 Jul 2011 20:53:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 65EC221C44E for ; Thu, 21 Jul 2011 20:53:40 +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 DEF1C1B400D for ; Thu, 21 Jul 2011 20:53:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0749E8003D for ; Thu, 21 Jul 2011 20:53:39 +0000 (UTC) From: "Wiktor W Brodlo" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Wiktor W Brodlo" Message-ID: 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: d511d5d13cdf9f543421fe2da718027377692939 Date: Thu, 21 Jul 2011 20:53:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 89d415c406d7fd729b37aa5ce23dc577 commit: d511d5d13cdf9f543421fe2da718027377692939 Author: wiktor w brodlo brodlo net> AuthorDate: Thu Jul 21 20:53:29 2011 +0000 Commit: Wiktor W Brodlo brodlo net> CommitDate: Thu Jul 21 20:53:29 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/anaconda.git;= a=3Dcommit;h=3Dd511d5d1 gentoo/utils.py: removed some cruft --- gentoo/utils.py | 98 -------------------------------------------------= ------ 1 files changed, 0 insertions(+), 98 deletions(-) diff --git a/gentoo/utils.py b/gentoo/utils.py index 8f04dc1..7548d51 100644 --- a/gentoo/utils.py +++ b/gentoo/utils.py @@ -749,11 +749,6 @@ class GentooInstall: def env_update(self): self.spawn_chroot("env-update &> /dev/null") =20 - #def _get_entropy_webservice(self): - # factory =3D self._entropy.WebServices() - # webserv =3D factory.new(REPO_NAME) - # return webserv - def emit_install_done(self): # user installed Gentoo, w00hooh! pass @@ -763,9 +758,6 @@ class GentooInstall: This function copies the stage3 into self._root """ =20 - # We don't remove stuff from the stage3 - #if not os.getenv("GENTOO_DISABLE_PKG_REMOVAL"): - # self._setup_packages_to_remove() =20 action =3D _("System Installation") copy_update_interval =3D 10 @@ -858,14 +850,6 @@ class GentooInstall: if currentfile.startswith("/dev/"): continue =20 - #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() =20 tofile =3D self._root + currentfile st_info =3D os.lstat(fromfile) @@ -886,88 +870,6 @@ class GentooInstall: =20 self._progress.set_fraction(1) =20 - #self._change_entropy_chroot(self._root) - # doing here, because client_repo should point to self._root chr= oot - #client_repo =3D self._entropy.installed_repository() - # NOT Removing Unwanted Packages - #if self._package_identifiers_to_remove: - - # this makes packages removal much faster - # client_repo.createAllIndexes() - - # total_counter =3D len(self._package_identifiers_to_remove) - # current_counter =3D 0 - # self._progress.set_fraction(current_counter) - # self._progress.set_text(_("Cleaning packages")) - # self._entropy.oldcount =3D [0,total_counter] - - # for pkg_id in self._package_identifiers_to_remove: - # current_counter +=3D 1 - # atom =3D client_repo.retrieveAtom(pkg_id) - # if not atom: - # continue - - ### XXX needed to speed up removal process - #""" - # category =3D client_repo.retrieveCategory(pkg_id) - # version =3D client_repo.retrieveVersion(pkg_id) - # name =3D client_repo.retrieveName(pkg_id) - # ebuild_path =3D self._root+"/var/db/pkg/%s/%s-%s" % ( - # category, name, version) - # if os.path.isdir(ebuild_path): - # shutil.rmtree(ebuild_path, True) - #""" - ### XXX - - # self.remove_package(None, match =3D (pkg_id,0), silent = =3D True) - # frac =3D float(current_counter)/total_counter - # self._progress.set_fraction(frac) - # self._progress.set_text("%s: %s" % ( - # _("Cleaning package"), atom,)) - # self._entropy.oldcount =3D [current_counter, total_coun= ter] - - #while 1: - # change =3D False - # mydirs =3D set() - #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 - - # We don't do that on Gentoo - # list installed packages and setup a package set - #inst_packages =3D ['%s:%s\n' % (entropy.dep.dep_getkey(atom),sl= ot,) \ - # for idpk, atom, slot, revision in client_repo.listAllPackag= es( - # get_scope =3D True, order_by =3D "atom")] - # perfectly fine w/o self._root - #pkgset_dir =3D etpConst['confsetsdir'] - #if not os.path.isdir(pkgset_dir): - # os.makedirs(pkgset_dir, 0755) - #set_name =3D "install_base" - #set_filepath =3D os.path.join(pkgset_dir, set_name) - #try: - # f =3D open(set_filepath,"w") - # f.writelines(inst_packages) - # f.flush() - # f.close() - #except (IOError,): - # pass - - #self._change_entropy_chroot() - - self._progress.set_fraction(1) self._progress.set_text(_("Installation complete")) =20 def language_packs_install(self):