/[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 1270 Revision 1280
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.34 2006/02/05 20:29:40 agaffney Exp $ 8$Id: GLIPortage.py,v 1.35 2006/02/07 02:05:39 agaffney Exp $
9""" 9"""
10 10
11import re 11import re
12import os 12import os
13import GLIUtility 13import GLIUtility
66 elif parts[0] == "sym": 66 elif parts[0] == "sym":
67 entries.append(" ".join(parts[1:4])) 67 entries.append(" ".join(parts[1:4]))
68 entries.sort() 68 entries.sort()
69 return entries 69 return entries
70 70
71 def copy_pkg_to_chroot(self, package, use_root=False): 71 def copy_pkg_to_chroot(self, package, use_root=False, ignore_missing=False):
72 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/',
73 '/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/',
74 '/etc/gconf': '/usr/livecd/gconf/' } 74 '/etc/gconf': '/usr/livecd/gconf/' }
75 75
76 tmpdir = "/var/tmp/portage" 76 tmpdir = "/var/tmp/portage"
82 if use_root: 82 if use_root:
83 root_cmd = "ROOT=" + self._chroot_dir 83 root_cmd = "ROOT=" + self._chroot_dir
84 tmp_chroot_dir = "" 84 tmp_chroot_dir = ""
85 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/" 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)
87 96
88 # 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
89 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)
90 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)):
91 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)

Legend:
Removed from v.1270  
changed lines
  Added in v.1280

  ViewVC Help
Powered by ViewVC 1.1.20