/[gli]/branches/overhaul/src/GLIArchitectureTemplate.py
Gentoo

Diff of /branches/overhaul/src/GLIArchitectureTemplate.py

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

Revision 1449 Revision 1454
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: GLIArchitectureTemplate.py,v 1.278 2006/06/07 01:20:35 agaffney Exp $ 8$Id: GLIArchitectureTemplate.py,v 1.279 2006/06/07 03:28:32 agaffney Exp $
9 9
10The ArchitectureTemplate is largely meant to be an abstract class and an 10The ArchitectureTemplate is largely meant to be an abstract class and an
11interface (yes, it is both at the same time!). The purpose of this is to create 11interface (yes, it is both at the same time!). The purpose of this is to create
12subclasses that populate all the methods with working methods for that architecture. 12subclasses that populate all the methods with working methods for that architecture.
13The only definitions that are filled in here are architecture independent. 13The only definitions that are filled in here are architecture independent.
256 except: 256 except:
257 raise GLIException("CreateStage3Error", "fatal", "unpack_stage_tarball", "Could not open /usr/livecd/systempkgs.txt") 257 raise GLIException("CreateStage3Error", "fatal", "unpack_stage_tarball", "Could not open /usr/livecd/systempkgs.txt")
258 258
259 # Pre-create /lib (and possibly /lib32 and /lib64) 259 # Pre-create /lib (and possibly /lib32 and /lib64)
260 for libdir in ("/lib", "/usr/lib"): 260 for libdir in ("/lib", "/usr/lib"):
261 if os.path.islink(libdir) and os.readlink(libdir) == libdir + "64": 261 if os.path.islink(libdir) and os.readlink(libdir).endswith("64"):
262 if self._debug: self._logger.log("DEBUG: unpack_stage_tarball(): precreating " + libdir + "64 dir and " + libdir + " -> " + libdir + "64 symlink because glibc/portage sucks") 262 if self._debug: self._logger.log("DEBUG: unpack_stage_tarball(): precreating " + libdir + "64 dir and " + libdir + " -> " + libdir + "64 symlink because glibc/portage sucks")
263 if not GLIUtility.exitsuccess(GLIUtility.spawn("mkdir " + self._chroot_dir + libdir + "64 && ln -s " + libdir[1:] + "64 " + self._chroot_dir + libdir)): 263 if not GLIUtility.exitsuccess(GLIUtility.spawn("mkdir " + self._chroot_dir + libdir + "64 && ln -s " + libdir[1:] + "64 " + self._chroot_dir + libdir)):
264 raise GLIException("CreateStage3Error", "fatal", "unpack_stage_tarball", "Could not precreate " + libdir + "64 dir and " + libdir + " -> " + libdir + "64 symlink") 264 raise GLIException("CreateStage3Error", "fatal", "unpack_stage_tarball", "Could not precreate " + libdir + "64 dir and " + libdir + " -> " + libdir + "64 symlink")
265 265
266 syspkglen = len(systempkgs) 266 syspkglen = len(systempkgs)

Legend:
Removed from v.1449  
changed lines
  Added in v.1454

  ViewVC Help
Powered by ViewVC 1.1.20