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

Legend:
Removed from v.1205  
changed lines
  Added in v.1297

  ViewVC Help
Powered by ViewVC 1.1.20