/[gli]/trunk/src/GLIPortage.py
Gentoo

Diff of /trunk/src/GLIPortage.py

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

Revision 1204 Revision 1305
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.18 2006/01/01 03:46:04 agaffney Exp $ 8$Id: GLIPortage.py,v 1.42 2006/02/17 17:47:40 agaffney Exp $
9""" 9"""
10 10
11import re 11import re
12import os
12import GLIUtility 13import GLIUtility
13from GLIException import GLIException 14from GLIException import GLIException
14 15
15class GLIPortage(object): 16class GLIPortage(object):
16 17
17 def __init__(self, chroot_dir, grp_install, logger, debug): 18 def __init__(self, chroot_dir, grp_install, logger, debug, cc, compile_logfile):
18 self._chroot_dir = chroot_dir 19 self._chroot_dir = chroot_dir
19 self._grp_install = grp_install 20 self._grp_install = grp_install
20 self._logger = logger 21 self._logger = logger
21 self._debug = debug 22 self._debug = debug
23 self._cc = cc
24 self._compile_logfile = compile_logfile
22 25
23 def get_deps(self, pkgs): 26 def get_deps(self, pkgs):
24 pkglist = [] 27 pkglist = []
25 if isinstance(pkgs, str): 28 if isinstance(pkgs, str):
26 pkgs = pkgs.split() 29 pkgs = pkgs.split()
27 for pkg in pkgs: 30 for pkg in pkgs:
31 if not pkg: continue
28 if self._debug: self._logger.log("get_deps(): pkg is " + pkg) 32 if self._debug: self._logger.log("get_deps(): pkg is " + pkg)
29 if not self._grp_install or not self.get_best_version_vdb(pkg): 33 if not self._grp_install or not self.get_best_version_vdb(pkg):
30 if self._debug: self._logger.log("get_deps(): grabbing compile deps") 34 if self._debug: self._logger.log("get_deps(): grabbing compile deps")
31# del(os.environ['ROOT'])
32 tmppkglist = GLIUtility.spawn("emerge -p " + pkgs + r" | grep -e '^\[[a-z]' | cut -d ']' -f2 | sed -e 's:^ ::' -e 's: .\+$::'", chroot=self._chroot_dir, return_output=True)[1].strip().split("\n") 35 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# os.environ['ROOT'] = self._chroot_dir
34 else: 36 else:
35 if self._debug: self._logger.log("get_deps(): grabbing binary deps") 37 if self._debug: self._logger.log("get_deps(): grabbing binary deps")
38 # The runtimedeps.py script generates a package install order that is *very* different from emerge itself
36 tmppkglist = GLIUtility.spawn("python ../../runtimedeps.py " + self._chroot_dir + " " + pkg, return_output=True)[1].strip().split("\n") 39# tmppkglist = GLIUtility.spawn("python ../../runtimedeps.py " + self._chroot_dir + " " + pkg, return_output=True)[1].strip().split("\n")
40 tmppkglist = []
41 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"):
42 if self._debug: self._logger.log("get_deps(): looking at " + tmppkg)
43 if self.get_best_version_vdb("=" + tmppkg):
44 if self._debug: self._logger.log("get_deps(): package " + tmppkg + " in host vdb...adding to tmppkglist")
45 tmppkglist.append(tmppkg)
37 if self._debug: self._logger.log("get_deps(): deplist for " + pkg + ": " + str(tmppkglist)) 46 if self._debug: self._logger.log("get_deps(): deplist for " + pkg + ": " + str(tmppkglist))
38 for tmppkg in tmppkglist: 47 for tmppkg in tmppkglist:
39 if self._debug: self._logger.log("get_deps(): checking to see if " + tmppkg + " is already in pkglist") 48 if self._debug: self._logger.log("get_deps(): checking to see if " + tmppkg + " is already in pkglist")
40 if not tmppkg in pkglist and not self.get_best_version_vdb_chroot("=" + tmppkg): 49 if not tmppkg in pkglist and not self.get_best_version_vdb_chroot("=" + tmppkg):
41 if self._debug: self._logger.log("get_deps(): adding " + tmppkg + " to pkglist") 50 if self._debug: self._logger.log("get_deps(): adding " + tmppkg + " to pkglist")
42 pkglist.append(tmppkg) 51 pkglist.append(tmppkg)
43 if self._debug: self._logger.log("get_deps(): pkglist is " + str(pkglist)) 52 if self._debug: self._logger.log("get_deps(): pkglist is " + str(pkglist))
44 return pkglist 53 return pkglist
45 54
55 def parse_vdb_contents(self, file):
56 entries = []
57 try:
58 vdbfile = open(file, "r")
59 except:
60 return entries
61 for line in vdbfile.readlines():
62 parts = line.strip().split(" ")
63 if parts[0] == "obj":
64 entries.append(parts[1])
65# elif parts[0] == "dir":
66# entries.append(parts[1] + "/")
67 elif parts[0] == "sym":
68 entries.append(" ".join(parts[1:4]))
69 entries.sort()
70 return entries
71
46 def copy_pkg_to_chroot(self, package, use_root=False): 72 def copy_pkg_to_chroot(self, package, use_root=False, ignore_missing=False):
47 symlinks = { '/bin/': '/mnt/livecd/bin/', '/boot/': '/mnt/livecd/boot/', '/lib/': '/mnt/livecd/lib/', 73 symlinks = { '/bin': '/mnt/livecd/bin/', '/boot': '/mnt/livecd/boot/', '/lib': '/mnt/livecd/lib/',
48 '/opt/': '/mnt/livecd/opt/', '/sbin/': '/mnt/livecd/sbin/', '/usr/': '/mnt/livecd/usr/', 74 '/opt': '/mnt/livecd/opt/', '/sbin': '/mnt/livecd/sbin/', '/usr': '/mnt/livecd/usr/',
49 '/etc/gconf/': '/usr/livecd/gconf/' } 75 '/etc/gconf': '/usr/livecd/gconf/' }
50 76
77 tmpdir = "/var/tmp/portage"
78 image_dir = tmpdir + "/" + package.split("/")[1] + "/image"
51 root_cmd = "" 79 root_cmd = ""
52 tmp_chroot_dir = self._chroot_dir 80 tmp_chroot_dir = self._chroot_dir
53 portage_tmpdir = "/var/tmp/portage" 81 portage_tmpdir = "/var/tmp/portage"
82 vdb_dir = "/var/db/pkg/"
54 if use_root: 83 if use_root:
55 root_cmd = "ROOT=" + self._chroot_dir 84 root_cmd = "ROOT=" + self._chroot_dir
56 tmp_chroot_dir = "" 85 tmp_chroot_dir = ""
57 portage_tmpdir = self._chroot_dir + "/var/tmp/portage" 86 portage_tmpdir = self._chroot_dir + "/var/tmp/portage"
87 vdb_dir = self._chroot_dir + "/var/db/pkg/"
88
89 # Check to see if package is actually in vdb
90 if not GLIUtility.is_file("/var/db/pkg/" + package):
91 if ignore_missing:
92 if self._debug:
93 self._logger.log("DEBUG: copy_pkg_to_chroot(): package " + package + " does not have a vdb entry but ignore_missing=True...ignoring error")
94 return
95 else:
96 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "There is no vdb entry for " + package)
58 97
59 # Copy the vdb entry for the package from the LiveCD to the chroot 98 # Copy the vdb entry for the package from the LiveCD to the chroot
60 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): copying vdb entry for " + package) 99 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): copying vdb entry for " + package)
61 if not GLIUtility.exitsuccess(GLIUtility.spawn("mkdir -p " + self._chroot_dir + "/var/db/pkg/" + package + " && cp -a /var/db/pkg/" + package + "/* " + self._chroot_dir + "/var/db/pkg/" + package)): 100 if not GLIUtility.exitsuccess(GLIUtility.spawn("mkdir -p " + self._chroot_dir + "/var/db/pkg/" + package + " && cp -a /var/db/pkg/" + package + "/* " + self._chroot_dir + "/var/db/pkg/" + package)):
62 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not copy vdb entry for " + package) 101 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not copy vdb entry for " + package)
63 102
103 # Create the image dir in the chroot
104 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running 'mkdir -p " + self._chroot_dir + image_dir + "'")
105 if not GLIUtility.exitsuccess(GLIUtility.spawn("mkdir -p " + self._chroot_dir + image_dir)):
106 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not create image dir for " + package)
107
64 # Create list of files for tar to work with from CONTENTS file in vdb entry 108 # Create list of files for tar to work with from CONTENTS file in vdb entry
65 entries = GLIUtility.parse_vdb_contents("/var/db/pkg/" + package + "/CONTENTS") 109 entries = self.parse_vdb_contents("/var/db/pkg/" + package + "/CONTENTS")
110 if not entries:
111 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): no files for " + package + "...skipping tar and symlink fixup")
112 else:
66 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot: files for " + package + ": " + str(entries)) 113 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot: files for " + package + ": " + str(entries))
67 try: 114 try:
68 tarfiles = open("/tmp/tarfilelist", "w") 115 tarfiles = open("/tmp/tarfilelist", "w")
69 for entry in entries: 116 for entry in entries:
70 parts = entry.split(" ") 117 parts = entry.split(" ")
71 # Hack for symlink crappiness 118# # Hack for symlink crappiness
72 for symlink in symlinks: 119# for symlink in symlinks:
73 if parts[0].startswith(symlink): 120# if parts[0].startswith(symlink):
74 parts[0] = symlinks[symlink] + parts[0][len(symlink):] 121# parts[0] = symlinks[symlink] + parts[0][len(symlink):]
75 tarfiles.write(parts[0] + "\n") 122 tarfiles.write(parts[0] + "\n")
76 tarfiles.close() 123 tarfiles.close()
77 except: 124 except:
78 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not create filelist for " + package) 125 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not create filelist for " + package)
79 126
80 # Use tar to transfer files into IMAGE directory 127 # Use tar to transfer files into IMAGE directory
81 tmpdir = "/var/tmp/portage"
82 image_dir = tmpdir + "/" + package.split("/")[1] + "/image"
83 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running 'mkdir -p " + self._chroot_dir + image_dir + " && tar -c --files-from=/tmp/tarfilelist --no-recursion 2>/dev/null | tar -C " + self._chroot_dir + image_dir + " -x'") 128 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running 'tar -cp --files-from=/tmp/tarfilelist --no-recursion 2>/dev/null | tar -C " + self._chroot_dir + image_dir + " -xp'")
84 if not GLIUtility.exitsuccess(GLIUtility.spawn("mkdir -p " + self._chroot_dir + image_dir + " && tar -c --files-from=/tmp/tarfilelist --no-recursion 2>/dev/null | tar -C " + self._chroot_dir + image_dir + " -x")): 129 if not GLIUtility.exitsuccess(GLIUtility.spawn("tar -cp --files-from=/tmp/tarfilelist --no-recursion 2>/dev/null | tar -C " + self._chroot_dir + image_dir + " -xp")):
85 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute tar for " + package) 130 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute tar for " + package)
86 131
87 # More symlink crappiness hacks 132# # More symlink crappiness hacks
88 for symlink in symlinks: 133# for symlink in symlinks:
89 if GLIUtility.is_file(self._chroot_dir + image_dir + symlinks[symlink]): 134## if GLIUtility.is_file(self._chroot_dir + image_dir + symlinks[symlink]):
90# parts[0] = symlinks[symlink] + parts[len(symlink):] 135# if os.path.islink(self._chroot_dir + image_dir + symlink):
91 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): fixing /usr/livecd/gconf/ stuff in " + image_dir + " for " + package) 136# if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): fixing " + symlink + " symlink ickiness stuff in " + image_dir + " for " + package)
137# GLIUtility.spawn("rm " + self._chroot_dir + image_dir + symlink)
92 if not GLIUtility.exitsuccess(GLIUtility.spawn("mv " + self._chroot_dir + image_dir + symlinks[symlink] + " " + self._chroot_dir + image_dir + symlink)): 138# if not GLIUtility.exitsuccess(GLIUtility.spawn("mv " + self._chroot_dir + image_dir + symlinks[symlink] + " " + self._chroot_dir + image_dir + symlink)):
93 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not fix /usr/livecd/gconf/ stuff for " + package) 139# raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not fix " + symlink + " symlink ickiness for " + package)
94 140
95 # Run pkg_setup 141 # Run pkg_setup
96 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running pkg_setup for " + package) 142 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running pkg_setup for " + package)
97 if not GLIUtility.exitsuccess(GLIUtility.spawn("env " + root_cmd + " PORTAGE_TMPDIR=" + portage_tmpdir + " ebuild /var/db/pkg/" + package + "/*.ebuild setup", chroot=tmp_chroot_dir)): 143 if not GLIUtility.exitsuccess(GLIUtility.spawn("env " + root_cmd + " PORTAGE_TMPDIR=" + portage_tmpdir + " ebuild " + vdb_dir + package + "/*.ebuild setup", chroot=tmp_chroot_dir)):
98 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute pkg_setup for " + package) 144 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute pkg_setup for " + package)
99
100 # Run qmerge
101# if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running qmerge for " + package)
102# if not GLIUtility.exitsuccess(GLIUtility.spawn("env ROOT=" + self._chroot_dir + " PORTAGE_TMPDIR=" + self._chroot_dir + tmpdir + " ebuild " + self._chroot_dir + "/var/db/pkg/" + package + "/*.ebuild qmerge")):
103# raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute qmerge for " + package)
104 145
105 # Run pkg_preinst 146 # Run pkg_preinst
106 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running preinst for " + package) 147 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running preinst for " + package)
107 if not GLIUtility.exitsuccess(GLIUtility.spawn("env " + root_cmd + " PORTAGE_TMPDIR=" + portage_tmpdir + " ebuild /var/db/pkg/" + package + "/*.ebuild preinst", chroot=tmp_chroot_dir)): 148 if not GLIUtility.exitsuccess(GLIUtility.spawn("env " + root_cmd + " PORTAGE_TMPDIR=" + portage_tmpdir + " ebuild " + vdb_dir + package + "/*.ebuild preinst", chroot=tmp_chroot_dir)):
108 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute preinst for " + package) 149 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute preinst for " + package)
109 150
110 # Copy files from image_dir to chroot 151 # Copy files from image_dir to chroot
152 if not entries:
153 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): no files for " + package + "...skipping copy from image dir to /")
154 else:
111 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): copying files from " + image_dir + " to / for " + package) 155 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): copying files from " + image_dir + " to / for " + package)
112 if not GLIUtility.exitsuccess(GLIUtility.spawn("cp -a " + self._chroot_dir + image_dir + "/* " + self._chroot_dir)): 156# if not GLIUtility.exitsuccess(GLIUtility.spawn("cp -a " + self._chroot_dir + image_dir + "/* " + self._chroot_dir)):
157 if not GLIUtility.exitsuccess(GLIUtility.spawn("tar -C " + self._chroot_dir + image_dir + "/ -c . | tar -C " + self._chroot_dir + "/ -x")):
113 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not copy files from " + image_dir + " to / for " + package) 158 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not copy files from " + image_dir + " to / for " + package)
114 159
115 # Run pkg_postinst 160 # Run pkg_postinst
116 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running postinst for " + package) 161 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running postinst for " + package)
117 if not GLIUtility.exitsuccess(GLIUtility.spawn("env " + root_cmd + " PORTAGE_TMPDIR=" + portage_tmpdir + " ebuild /var/db/pkg/" + package + "/*.ebuild postinst", chroot=tmp_chroot_dir)): 162 if not GLIUtility.exitsuccess(GLIUtility.spawn("env " + root_cmd + " PORTAGE_TMPDIR=" + portage_tmpdir + " ebuild " + vdb_dir + package + "/*.ebuild postinst", chroot=tmp_chroot_dir)):
118 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute postinst for " + package) 163 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute postinst for " + package)
119 164
120 # Remove image_dir 165 # Remove image_dir
121 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): removing + " + image_dir + " for " + package) 166 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): removing " + image_dir + " for " + package)
122 if not GLIUtility.exitsuccess(GLIUtility.spawn("rm -rf " + self._chroot_dir + image_dir)): 167 if not GLIUtility.exitsuccess(GLIUtility.spawn("rm -rf " + self._chroot_dir + image_dir)):
123 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not remove + " + image_dir + " for " + package) 168 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not remove + " + image_dir + " for " + package)
169
170 # Run env-update
171 if not use_root:
172 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running env-update inside chroot")
173 if not GLIUtility.exitsuccess(GLIUtility.spawn("env-update", chroot=self._chroot_dir)):
174 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not run env-update for " + package)
124 175
125 def add_pkg_to_world(self, package): 176 def add_pkg_to_world(self, package):
126 if package.find("/") == -1: 177 if package.find("/") == -1:
127 package = self.get_best_version_vdb_chroot(package) 178 package = self.get_best_version_vdb_chroot(package)
128 if not package: return False 179 if not package: return False
129 expr = re.compile('^(.+?)(-\d.+)?$') 180 expr = re.compile('^=?(.+?/.+?)(-\d.+)?$')
130 res = expr.match(package) 181 res = expr.match(package)
131 if res: 182 if res:
132 GLIUtility.spawn("echo " + res.group(1) + " >> " + self._chroot_dir + "/var/lib/portage/world") 183 GLIUtility.spawn("echo " + res.group(1) + " >> " + self._chroot_dir + "/var/lib/portage/world")
133 184
134 def get_best_version_vdb(self, package): 185 def get_best_version_vdb(self, package):
186 if package.startswith('='):
187 package = package[1:]
188 if GLIUtility.is_file("/var/db/pkg/" + package):
189 return package
190 else:
191 return ""
192 else:
135 return GLIUtility.spawn("portageq best_version / " + package, return_output=True)[1].strip() 193 return GLIUtility.spawn("portageq best_version / " + package, return_output=True)[1].strip()
136 194
137 def get_best_version_vdb_chroot(self, package): 195 def get_best_version_vdb_chroot(self, package):
196 if package.startswith('='):
197 package = package[1:]
198 if GLIUtility.is_file(self._chroot_dir + "/var/db/pkg/" + package):
199 return package
200 else:
201 return ""
202 else:
138 return GLIUtility.spawn("portageq best_version / " + package, chroot=self._chroot_dir, return_output=True)[1].strip() 203 return GLIUtility.spawn("portageq best_version / " + package, chroot=self._chroot_dir, return_output=True)[1].strip()
139 204
140# def get_best_version_tree(self, package): 205# def get_best_version_tree(self, package):
141# return portage.best(tree.match(package)) 206# return portage.best(tree.match(package))
207
208 def emerge(self, packages, add_to_world=True):
209 if isinstance(packages, str):
210 packages = packages.split()
211 self._cc.addNotification("progress", (0, "Calculating dependencies for " + " ".join(packages)))
212 pkglist = self.get_deps(packages)
213 if self._debug: self._logger.log("install_packages(): pkglist is " + str(pkglist))
214 for i, pkg in enumerate(pkglist):
215 if not pkg: continue
216 if self._debug: self._logger.log("install_packages(): processing package " + pkg)
217 self._cc.addNotification("progress", (float(i) / len(pkglist), "Emerging " + pkg + " (" + str(i+1) + "/" + str(len(pkglist)) + ")"))
218 if not self._grp_install or not self.get_best_version_vdb("=" + pkg):
219 status = GLIUtility.spawn("emerge -1 =" + pkg, display_on_tty8=True, chroot=self._chroot_dir, logfile=self._compile_logfile, append_log=True)
220# status = self._emerge("=" + pkg)
221 if not GLIUtility.exitsuccess(status):
222 raise GLIException("EmergePackageError", "fatal", "emerge", "Could not emerge " + pkg + "!")
223 else:
224# try:
225 self.copy_pkg_to_chroot(pkg)
226# except:
227# raise GLIException("EmergePackageError", "fatal", "emerge", "Could not emerge " + pkg + "!")
228 self._cc.addNotification("progress", (float(i+1) / len(pkglist), "Done emerging " + pkg + " (" + str(i+1) + "/" + str(len(pkglist)) + ")"))
229 if add_to_world:
230 for package in packages:
231 self.add_pkg_to_world(package)

Legend:
Removed from v.1204  
changed lines
  Added in v.1305

  ViewVC Help
Powered by ViewVC 1.1.20