/[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 1214 Revision 1216
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.27 2006/01/03 02:31:38 agaffney Exp $ 8$Id: GLIPortage.py,v 1.28 2006/01/03 04:09:36 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
55 '/opt/': '/mnt/livecd/opt/', '/sbin/': '/mnt/livecd/sbin/', '/usr/': '/mnt/livecd/usr/', 56 '/opt/': '/mnt/livecd/opt/', '/sbin/': '/mnt/livecd/sbin/', '/usr/': '/mnt/livecd/usr/',
56 '/etc/gconf/': '/usr/livecd/gconf/' } 57 '/etc/gconf/': '/usr/livecd/gconf/' }
57 58
58 tmpdir = "/var/tmp/portage" 59 tmpdir = "/var/tmp/portage"
59 image_dir = tmpdir + "/" + package.split("/")[1] + "/image" 60 image_dir = tmpdir + "/" + package.split("/")[1] + "/image"
60
61 root_cmd = "" 61 root_cmd = ""
62 tmp_chroot_dir = self._chroot_dir 62 tmp_chroot_dir = self._chroot_dir
63 portage_tmpdir = "/var/tmp/portage" 63 portage_tmpdir = "/var/tmp/portage"
64 if use_root: 64 if use_root:
65 root_cmd = "ROOT=" + self._chroot_dir 65 root_cmd = "ROOT=" + self._chroot_dir
85 try: 85 try:
86 tarfiles = open("/tmp/tarfilelist", "w") 86 tarfiles = open("/tmp/tarfilelist", "w")
87 for entry in entries: 87 for entry in entries:
88 parts = entry.split(" ") 88 parts = entry.split(" ")
89 # Hack for symlink crappiness 89 # Hack for symlink crappiness
90 for symlink in symlinks: 90# for symlink in symlinks:
91 if parts[0].startswith(symlink): 91# if parts[0].startswith(symlink):
92 parts[0] = symlinks[symlink] + parts[0][len(symlink):] 92# parts[0] = symlinks[symlink] + parts[0][len(symlink):]
93 tarfiles.write(parts[0] + "\n") 93 tarfiles.write(parts[0] + "\n")
94 tarfiles.close() 94 tarfiles.close()
95 except: 95 except:
96 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not create filelist for " + package) 96 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not create filelist for " + package)
97 97
102 102
103 # More symlink crappiness hacks 103 # More symlink crappiness hacks
104 for symlink in symlinks: 104 for symlink in symlinks:
105 if GLIUtility.is_file(self._chroot_dir + image_dir + symlinks[symlink]): 105 if GLIUtility.is_file(self._chroot_dir + image_dir + symlinks[symlink]):
106 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): fixing " + symlink + " symlink ickiness stuff in " + image_dir + " for " + package) 106 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): fixing " + symlink + " symlink ickiness stuff in " + image_dir + " for " + package)
107 if os.path.islink(self._chroot_dir + image_dir + symlink):
108 if not GLIUtiltiy.exitsuccess(GLIUtility.spawn("rm " + self._chroot_dir + image_dir + symlink)):
109 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not remove symlink " + symlink + " for " + package)
107 if not GLIUtility.exitsuccess(GLIUtility.spawn("mv " + self._chroot_dir + image_dir + symlinks[symlink] + " " + self._chroot_dir + image_dir + symlink)): 110 if not GLIUtility.exitsuccess(GLIUtility.spawn("mv " + self._chroot_dir + image_dir + symlinks[symlink] + " " + self._chroot_dir + image_dir + symlink)):
108 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not fix /usr/livecd/gconf/ stuff for " + package) 111 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not fix " + symlink + " symlink ickiness for " + package)
109 112
110 # Run pkg_setup 113 # Run pkg_setup
111 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running pkg_setup for " + package) 114 if self._debug: self._logger.log("DEBUG: copy_pkg_to_chroot(): running pkg_setup for " + package)
112 if not GLIUtility.exitsuccess(GLIUtility.spawn("env " + root_cmd + " PORTAGE_TMPDIR=" + portage_tmpdir + " ebuild /var/db/pkg/" + package + "/*.ebuild setup", chroot=tmp_chroot_dir)): 115 if not GLIUtility.exitsuccess(GLIUtility.spawn("env " + root_cmd + " PORTAGE_TMPDIR=" + portage_tmpdir + " ebuild /var/db/pkg/" + package + "/*.ebuild setup", chroot=tmp_chroot_dir)):
113 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute pkg_setup for " + package) 116 raise GLIException("CopyPackageToChrootError", 'fatal', 'copy_pkg_to_chroot', "Could not execute pkg_setup for " + package)

Legend:
Removed from v.1214  
changed lines
  Added in v.1216

  ViewVC Help
Powered by ViewVC 1.1.20