/[gli]/branches/qs/src/GLIPortage.py
Gentoo

Diff of /branches/qs/src/GLIPortage.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1209 Revision 1210
3# This source code is distributed under the terms of version 2 of the GNU 3# This source code is distributed under the terms of version 2 of the GNU
4# General Public License as published by the Free Software Foundation, a copy 4# General Public License as published by the Free Software Foundation, a copy
5# of which can be found in the main directory of this project. 5# of which can be found in the main directory of this project.
6Gentoo Linux Installer 6Gentoo Linux Installer
7 7
8$Id: GLIPortage.py,v 1.23 2006/01/02 23:02:25 agaffney Exp $ 8$Id: GLIPortage.py,v 1.24 2006/01/03 00:45:30 agaffney Exp $
9""" 9"""
10 10
11import re 11import re
12import GLIUtility 12import GLIUtility
13from GLIException import GLIException 13from GLIException import GLIException
31 if not self._grp_install or not self.get_best_version_vdb(pkg): 31 if not self._grp_install or not self.get_best_version_vdb(pkg):
32 if self._debug: self._logger.log("get_deps(): grabbing compile deps") 32 if self._debug: self._logger.log("get_deps(): grabbing compile deps")
33 tmppkglist = GLIUtility.spawn("emerge -p " + pkg + r" 2>/dev/null | grep -e '^\[[a-z]' | cut -d ']' -f2 | sed -e 's:^ ::' -e 's: .\+$::'", chroot=self._chroot_dir, return_output=True)[1].strip().split("\n") 33 tmppkglist = GLIUtility.spawn("emerge -p " + pkg + r" 2>/dev/null | grep -e '^\[[a-z]' | cut -d ']' -f2 | sed -e 's:^ ::' -e 's: .\+$::'", chroot=self._chroot_dir, return_output=True)[1].strip().split("\n")
34 else: 34 else:
35 if self._debug: self._logger.log("get_deps(): grabbing binary deps") 35 if self._debug: self._logger.log("get_deps(): grabbing binary deps")
36 # Until I have a unified method of getting binary and compile deps, I can't reliably merge the deptrees 36 # The runtimedeps.py script generates a package install order that is *very* different from emerge itself
37 tmppkglist = GLIUtility.spawn("python ../../runtimedeps.py " + self._chroot_dir + " " + pkg, return_output=True)[1].strip().split("\n") 37# tmppkglist = GLIUtility.spawn("python ../../runtimedeps.py " + self._chroot_dir + " " + pkg, return_output=True)[1].strip().split("\n")
38# tmppkglist = [] 38 tmppkglist = []
39# for tmppkg in GLIUtility.spawn("emerge -p " + pkg + r" 2>/dev/null | grep -e '^\[[a-z]' | cut -d ']' -f2 | sed -e 's:^ ::' -e 's: .\+$::'", chroot=self._chroot_dir, return_output=True)[1].strip().split("\n"): 39 for tmppkg in GLIUtility.spawn("emerge -p " + pkg + r" 2>/dev/null | grep -e '^\[[a-z]' | cut -d ']' -f2 | sed -e 's:^ ::' -e 's: .\+$::'", chroot=self._chroot_dir, return_output=True)[1].strip().split("\n"):
40# if self._debug: self._logger.log("get_deps(): looking at " + tmppkg) 40 if self._debug: self._logger.log("get_deps(): looking at " + tmppkg)
41# if self.get_best_version_vdb_chroot("=" + tmppkg): 41 if self.get_best_version_vdb_chroot("=" + tmppkg):
42# if self._debug: self._logger.log("get_deps(): package " + tmppkg + " in vdb...adding to tmppkglist") 42 if self._debug: self._logger.log("get_deps(): package " + tmppkg + " in host vdb...adding to tmppkglist")
43# tmppkglist.append(tmppkg) 43 tmppkglist.append(tmppkg)
44 if self._debug: self._logger.log("get_deps(): deplist for " + pkg + ": " + str(tmppkglist)) 44 if self._debug: self._logger.log("get_deps(): deplist for " + pkg + ": " + str(tmppkglist))
45 for tmppkg in tmppkglist: 45 for tmppkg in tmppkglist:
46 if self._debug: self._logger.log("get_deps(): checking to see if " + tmppkg + " is already in pkglist") 46 if self._debug: self._logger.log("get_deps(): checking to see if " + tmppkg + " is already in pkglist")
47 if not tmppkg in pkglist and not self.get_best_version_vdb_chroot("=" + tmppkg): 47 if not tmppkg in pkglist and not self.get_best_version_vdb_chroot("=" + tmppkg):
48 if self._debug: self._logger.log("get_deps(): adding " + tmppkg + " to pkglist") 48 if self._debug: self._logger.log("get_deps(): adding " + tmppkg + " to pkglist")

Legend:
Removed from v.1209  
changed lines
  Added in v.1210

  ViewVC Help
Powered by ViewVC 1.1.20