diff options
| author |   Preston Cody <codeman@gentoo.org> | 2007-11-17 19:11:55 +0000 |
|---|---|---|
| committer | Preston Cody <codeman@gentoo.org> | 2007-11-17 19:11:55 +0000 |
| commit | 1f6a474ef9786d4533be97c1a2462f81df0e43b1 (patch) | |
| tree | ab637052a79898fcebd1222f92119e6c9bb3b5c8 | |
| parent | move around parentheses to fix bug 179528 (diff) | |
| download | gli-1f6a474ef9786d4533be97c1a2462f81df0e43b1.tar.gz gli-1f6a474ef9786d4533be97c1a2462f81df0e43b1.tar.bz2 gli-1f6a474ef9786d4533be97c1a2462f81df0e43b1.zip | |
adding a check after stage3 extraction or creation
to ensure /etc/make.conf exists.
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/trunk@1863 f8877401-5920-0410-a79b-8e2d7e04ca0d
| -rw-r--r-- | src/GLIArchitectureTemplate.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/GLIArchitectureTemplate.py b/src/GLIArchitectureTemplate.py index 88e5c59..b4397da 100644 --- a/src/GLIArchitectureTemplate.py +++ b/src/GLIArchitectureTemplate.py @@ -453,10 +453,14 @@ class ArchitectureTemplate: GLIUtility.spawn("chmod 755 /tmp/extrastuff.sh && /tmp/extrastuff.sh", chroot=self._chroot_dir, display_on_tty8=True, logfile=self._compile_logfile, append_log=True) GLIUtility.spawn("rm -rf /var/tmp/portage/* /usr/portage /tmp/*", chroot=self._chroot_dir) self.notify_frontend("progress", (1, "Done")) + if not GLIUtility.is_file("/etc/make.conf"): + raise GLIException("CreateStage3Error", "fatal", "unpack_stage_tarball", "Something went wrong during stage3 generation, /etc/make.conf doesn't exist on the new system! ") self._logger.log("Stage3 was generated successfully") else: self._logger.log("Fetching and unpacking tarball: "+self._install_profile.get_stage_tarball_uri()) GLIUtility.fetch_and_unpack_tarball(self._install_profile.get_stage_tarball_uri(), self._chroot_dir, temp_directory=self._chroot_dir, keep_permissions=True, cc=self._cc) + if not GLIUtility.is_file("/etc/make.conf"): + raise GLIException("CreateStage3Error", "fatal", "unpack_stage_tarball", "Something went wrong during stage3 generation, /etc/make.conf doesn't exist on the new system! ") self._logger.log(self._install_profile.get_stage_tarball_uri()+" was fetched and unpacked.") ## |