* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-06-25 1:42 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-06-25 1:42 UTC (permalink / raw
To: gentoo-commits
commit: 607de627ad6a60288f14dd89f38458d701d738e3
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Jun 25 01:40:54 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Jun 25 01:40:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=607de627
Portage install method version 1 ;-)
---
gentoo/__init__.py | 126 +++++++--------------------------------------------
1 files changed, 18 insertions(+), 108 deletions(-)
diff --git a/gentoo/__init__.py b/gentoo/__init__.py
index 629cba8..1cb23d9 100644
--- a/gentoo/__init__.py
+++ b/gentoo/__init__.py
@@ -1,8 +1,9 @@
#
-# gentoo.py: Gentoo Linux Anaconda install method backend
+# gentoo/__init__.py: Gentoo Portage Anaconda install method backend
#
#
-# Copyright (C) 2010 Fabio Erculiani
+# Copyright (C) 2011 wiktor w brodlo <wiktor@brodlo.net>
+# Copyright (C) 2011 Gentoo Foundation
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,113 +22,22 @@
import os
import sys
-# add Entropy module path to PYTHONPATH
-sys.path.insert(0, '/usr/lib/entropy/libraries')
+class Portage:
-# Entropy Interface
-from entropy.client.interfaces import Client
-from entropy.output import nocolor
-from entropy.fetchers import UrlFetcher
-import entropy.tools
+ def __init__(self, terminal):
+ self.term = terminal
+ # chroot into the new installation if not already there
+ self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" 2> /dev/null")
-class Entropy(Client):
+ # Syncs the Portage tree and updates Portage if an update is available
+ def sync(self):
+ self.term.run_command("emerge --sync")
+ self.term.run_command("emerge --update portage")
- def init_singleton(self):
- self._progress = None
- self.oldcount = []
- Client.init_singleton(self, xcache = False,
- url_fetcher = InstallerUrlFetcher)
- nocolor()
+ # Installs a package atom
+ def install(self, atom):
+ terminal.run_command("emerge "+atom)
- def connect_progress(self, progress):
- self._progress = progress
-
- def output(self, text, header = "", footer = "", back = False,
- importance = 0, level = "info", count = None, percent = False):
-
- if not self._progress:
- return
-
- if not self.oldcount:
- self.oldcount = [0,100]
-
- progress_text = text
- if count:
- try:
- self.oldcount = int(count[0]),int(count[1])
- except:
- self.oldcount = [0,100]
- if not percent:
- count_str = "(%s/%s) " % (str(count[0]),str(count[1]),)
- progress_text = count_str+progress_text
-
- percentage = float(self.oldcount[0])/self.oldcount[1] * 100
- percentage = round(percentage, 2)
- self._progress.set_fraction(percentage)
- self._progress.set_text(progress_text)
-
- def is_installed(self, package_name):
- match = self.installed_repository().atomMatch(package_name)
- if match[0] != -1:
- return True
- return False
-
- @staticmethod
- def is_corecd():
- if os.path.isfile("/etc/gentoo-edition"):
- f = open("/etc/gentoo-edition","r")
- cnt = f.readline().strip()
- f.close()
- if cnt.lower().find("core") != -1:
- return True
- return False
-
- @staticmethod
- def is_gentoo_mce():
- with open("/proc/cmdline", "r") as cmd_f:
- args = cmd_f.readline().strip().split()
- for tstr in ("mceinstall", "gentoomce"):
- if tstr in args:
- return True
- return False
-
-# in this way, any singleton class that tries to directly load Client
-# gets Entropy in change
-Client.__singleton_class__ = Entropy
-
-class InstallerUrlFetcher(UrlFetcher):
-
- gui_last_avg = 0
-
- def handle_statistics(self, th_id, downloaded_size, total_size,
- average, old_average, update_step, show_speed, data_transfer,
- time_remaining, time_remaining_secs):
- self.__average = average
- self.__downloadedsize = downloaded_size
- self.__remotesize = total_size
- self.__datatransfer = data_transfer
-
- def output(self):
- """ backward compatibility """
- return self.update()
-
- def update(self):
-
- myavg = abs(int(round(float(self.__average), 1)))
- if abs((myavg - InstallerUrlFetcher.gui_last_avg)) < 1:
- return
-
- if (myavg > InstallerUrlFetcher.gui_last_avg) or (myavg < 2) or \
- (myavg > 97):
-
- cur_prog = float(self.__average)/100
- cur_prog_str = str(int(self.__average))
-
- human_dt = entropy.tools.bytes_into_human(self.__datatransfer)
- prog_str = "%s/%s kB @ %s" % (
- str(round(float(self.__downloadedsize)/1024, 1)),
- str(round(self.__remotesize, 1)),
- str(human_dt) + "/sec",
- )
- Entropy().output(prog_str)
- InstallerUrlFetcher.gui_last_avg = myavg
+ # Updates world
+ def update_world(self):
+ terminal.run_command("emerge --deep --newuse --update world")
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-06-26 19:05 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-06-26 19:05 UTC (permalink / raw
To: gentoo-commits
commit: 0bc22cd7337861035c985fea6787c1533f41c691
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jun 26 19:04:30 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jun 26 19:04:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=0bc22cd7
gentoo/livecd.py: Removal of Entropy
---
gentoo/livecd.py | 29 +++++++----------------------
1 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index 1fab963..388d889 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -3,6 +3,8 @@
# livecd.py
#
# Copyright (C) 2010 Fabio Erculiani
+# Copyright (C) 2011 wiktor w brodlo
+# Copyright (C) 2011 Gentoo Foundation
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -41,13 +43,7 @@ import iutil
import logging
from anaconda_log import PROGRAM_LOG_FILE
import gentoo.utils
-from gentoo import Entropy
-
-# Entropy imports
-from entropy.const import etpConst, const_kill_threads
-from entropy.misc import TimeScheduled, ParallelTask
-from entropy.cache import EntropyCacher
-import entropy.tools
+from gentoo import Portage
log = logging.getLogger("anaconda")
@@ -62,6 +58,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
self.osimg = anaconda.methodstr[8:]
# On Gentoo we're using a stage3 as an installation source
+ # FIXME: Replace this with checking for stage3
#if not os.path.ismount(self.osimg):
# anaconda.intf.messageWindow(_("Unable to find image"),
# _("The given location [%s] isn't a valid %s "
@@ -71,6 +68,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
# custom_buttons=[_("Exit installer")])
# raise SystemExit(1)
+ # _getLiveSize() needs to be adjusted but more measurements are needed
def _getLiveSize(self):
st = os.statvfs(PRODUCT_PATH)
compressed_byte_size = st.f_blocks * st.f_bsize
@@ -93,8 +91,6 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
def doPreInstall(self, anaconda):
self._progress = gentoo.utils.GentooProgress(anaconda)
self._progress.start()
- self._entropy = Entropy()
- self._entropy.connect_progress(self._progress)
self._gentoo_install = gentoo.utils.GentooInstall(anaconda)
# We use anaconda.upgrade as bootloader recovery step
self._bootloader_recovery = anaconda.upgrade
@@ -135,6 +131,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
self._gentoo_install.setup_audio()
self._gentoo_install.setup_xorg()
self._gentoo_install.remove_proprietary_drivers()
+ # TODO: This needs to be tried and fixed properly on Gentoo once installing X works
try:
self._gentoo_install.setup_nvidia_legacy()
except Exception as e:
@@ -163,18 +160,13 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
def doPostInstall(self, anaconda):
- self._gentoo_install.setup_entropy_mirrors()
+ self._gentoo_install.setup_portage_mirrors()
self._gentoo_install.language_packs_install()
self._gentoo_install.emit_install_done()
storage.writeEscrowPackets(anaconda)
self._gentoo_install.destroy()
- if hasattr(self._entropy, "shutdown"):
- self._entropy.shutdown()
- else:
- self._entropy.destroy()
- EntropyCacher().stop()
const_kill_threads()
anaconda.intf.setInstallProgressClass(None)
@@ -280,12 +272,6 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
"gentoomce", "quiet", "scandelay=", "doslowusb", "docrypt",
"dokeymap", "keymap=", "radeon.modeset=", "modeset=", "nomodeset"]
- # Gentoo MCE install -> MCE support
- # use reference, yeah
- cmdline = self._gentoo_install.cmdline
- if Entropy.is_gentoo_mce() and ("gentoomce" not in cmdline):
- cmdline.append("gentoomce")
-
# Setup genkernel (init) keyboard layout
if gk_kbd is not None:
if "dokeymap" not in cmdline:
@@ -458,7 +444,6 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
#cmdline = ' '.join([x for x in cmdline.split() if \
# not x.startswith("vga=")])
- # Since Gentoo 5.4, we also write to /etc/default/gentoo-grub
grub_gentoo_file = self._root + "/etc/default/gentoo-grub"
grub_gentoo_dir = os.path.dirname(grub_gentoo_file)
if not os.path.isdir(grub_gentoo_dir):
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-06-26 21:03 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-06-26 21:03 UTC (permalink / raw
To: gentoo-commits
commit: 314aefd4ae326784584bcd07ecbacd8ccc4baee7
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jun 26 20:47:05 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jun 26 20:47:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=314aefd4
Added Portage.remove(), added return values
---
gentoo/__init__.py | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/gentoo/__init__.py b/gentoo/__init__.py
index 1cb23d9..27ba852 100644
--- a/gentoo/__init__.py
+++ b/gentoo/__init__.py
@@ -32,12 +32,31 @@ class Portage:
# Syncs the Portage tree and updates Portage if an update is available
def sync(self):
self.term.run_command("emerge --sync")
+ if self.term.get_child_exit_status() != 0:
+ return False
self.term.run_command("emerge --update portage")
+ if self.term.get_child_exit_status() == 0:
+ return True
+ return False
# Installs a package atom
def install(self, atom):
- terminal.run_command("emerge "+atom)
+ self.term.run_command("emerge "+atom)
+ if self.term.get_child_exit_status() == 0:
+ return True
+ return False
# Updates world
def update_world(self):
- terminal.run_command("emerge --deep --newuse --update world")
+ self.term.run_command("emerge --deep --newuse --update world")
+ if self.term.get_child_exit_status() == 0:
+ return True
+ return False
+
+ # Removes a package atom
+ def remove(self, atom):
+ self.term.run_command("emerge -C "+atom)
+ if self.term.get_child_exit_status() == 0:
+ return True
+ return False
+
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-06-26 21:03 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-06-26 21:03 UTC (permalink / raw
To: gentoo-commits
commit: 43b2ebc433a997d0cb2d4ae8001f773f3186df5f
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jun 26 21:02:45 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jun 26 21:02:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=43b2ebc4
Removed unneded functions and changed Entropy to Portage
---
gentoo/utils.py | 1069 +++++++++++++++++++++++++------------------------------
1 files changed, 485 insertions(+), 584 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index d5f5ab3..2cc58ba 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -3,6 +3,8 @@
# gentoo/utils.py
#
# Copyright (C) 2010 Fabio Erculiani
+# Copyright (C) 2011 wiktor w brodlo
+# Copyright (C) 2011 Gentoo Foundation
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -32,19 +34,10 @@ import statvfs
import tempfile
import time
-# Entropy imports
-from entropy.exceptions import EntropyPackageException
-from entropy.const import etpUi, etpConst, etpSys
-import entropy.tools
-import entropy.dep
-from entropy.core.settings.base import SystemSettings
-from entropy.core import Singleton
-from entropy.services.client import WebService
-
# Anaconda imports
import logging
from constants import productPath
-from gentoo import Entropy
+from gentoo import Portage
from gentoo.const import LIVE_USER, LANGUAGE_PACKS, REPO_NAME
import gettext
@@ -125,50 +118,51 @@ class GentooProgress(Singleton):
self._process_events()
else:
self._prog.set_fraction(pct)
-
- def _spawn_adimage(self):
-
- if not self.__adbox_running:
- return
-
- cur_t = time.time()
- if cur_t <= (self.__image_t + 10):
- return
- self.__image_t = cur_t
-
- pixmaps = getattr(self._prog, 'pixmaps', [])
- pix_len = len(pixmaps)
- if pix_len == 0:
- log.warning("Shutting down _spawn_adimage, no images")
- self.__adbox_running = False
- return
-
- if not self._prog.adpix:
- log.warning("Shutting down _spawn_adimage, no adpix")
- self.__adbox_running = False
- return
-
- try:
- pix_path = pixmaps[self._pix_count]
- except IndexError:
- self._pix_count = 0
- pix_path = pixmaps[0]
-
- self._pix_count += 1
-
- import gui
- pix = gui.readImageFromFile(pix_path)
- if pix:
- self._prog.adbox.remove(self._prog.adpix)
- self._prog.adpix.destroy()
- pix.set_alignment(0.5, 0.5)
- self._prog.adbox.add(pix)
- self._prog.adpix = pix
- else:
- log.warning("Shutting down _spawn_adimage, no pixmap: %s" % (
- pix_path,))
-
- self._prog.adbox.show_all()
+
+ # TODO: Check if we need this
+ #def _spawn_adimage(self):
+
+ # if not self.__adbox_running:
+ # return
+
+ # cur_t = time.time()
+ # if cur_t <= (self.__image_t + 10):
+ # return
+ # self.__image_t = cur_t
+
+ # pixmaps = getattr(self._prog, 'pixmaps', [])
+ # pix_len = len(pixmaps)
+ # if pix_len == 0:
+ # log.warning("Shutting down _spawn_adimage, no images")
+ # self.__adbox_running = False
+ # return
+
+ # if not self._prog.adpix:
+ # log.warning("Shutting down _spawn_adimage, no adpix")
+ # self.__adbox_running = False
+ # return
+
+ # try:
+ # pix_path = pixmaps[self._pix_count]
+ # except IndexError:
+ # self._pix_count = 0
+ # pix_path = pixmaps[0]
+
+ # self._pix_count += 1
+
+ # import gui
+ # pix = gui.readImageFromFile(pix_path)
+ # if pix:
+ # self._prog.adbox.remove(self._prog.adpix)
+ # self._prog.adpix.destroy()
+ # pix.set_alignment(0.5, 0.5)
+ # self._prog.adbox.add(pix)
+ # self._prog.adpix = pix
+ # else:
+ # log.warning("Shutting down _spawn_adimage, no pixmap: %s" % (
+ # pix_path,))
+
+ # self._prog.adbox.show_all()
class GentooInstall:
@@ -180,39 +174,40 @@ class GentooInstall:
self._prod_root = productPath
self._intf = anaconda.intf
self._progress = GentooProgress(anaconda)
- self._entropy = Entropy()
+ self._portage = Portage()
self._settings = SystemSettings()
with open("/proc/cmdline", "r") as cmd_f:
self.cmdline = cmd_f.readline().strip().split()
#sys.stderr = STDERR_LOG
- self._files_db_path = self._root+"/files.db"
- try:
- self._files_db = self._entropy.open_generic_repository(
- self._files_db_path, dbname = "filesdb",
- indexing_override = True)
- except TypeError:
- # new API
- self._files_db = self._entropy.open_generic_repository(
- self._files_db_path, name = "filesdb",
- indexing_override = True)
- if hasattr(self._files_db, "initializeDatabase"):
- self._files_db.initializeDatabase()
- else:
- self._files_db.initializeRepository()
- self._live_repo = self._open_live_installed_repository()
- self._package_identifiers_to_remove = set()
+ # TODO: Remove or change this
+ #self._files_db_path = self._root+"/files.db"
+ #try:
+ # self._files_db = self._entropy.open_generic_repository(
+ # self._files_db_path, dbname = "filesdb",
+ # indexing_override = True)
+ #except TypeError:
+ # # new API
+ # self._files_db = self._entropy.open_generic_repository(
+ # self._files_db_path, name = "filesdb",
+ # indexing_override = True)
+ #if hasattr(self._files_db, "initializeDatabase"):
+ # self._files_db.initializeDatabase()
+ #else:
+ # self._files_db.initializeRepository()
+ #self._live_repo = self._open_live_installed_repository()
+ #self._package_identifiers_to_remove = set()
def destroy(self):
# remove files db if exists
- if hasattr(self._files_db, "close"):
- self._files_db.close()
- else:
- self._files_db.closeDB()
- try:
- os.remove(self._files_db_path)
- except OSError:
- pass
+ #if hasattr(self._files_db, "close"):
+ # self._files_db.close()
+ #else:
+ # self._files_db.closeDB()
+ #try:
+ # os.remove(self._files_db_path)
+ #except OSError:
+ # pass
self._progress.stop()
@@ -246,165 +241,167 @@ class GentooInstall:
myargs = ' '.join(args)
return subprocess.call(myargs, shell = True)
- def _open_live_installed_repository(self):
- dbpath = self._prod_root + etpConst['etpdatabaseclientfilepath']
- try:
- dbconn = self._entropy.open_generic_repository(
- dbpath, xcache = False, read_only = True,
- dbname = "live_client", indexing_override = False)
- except TypeError:
- # new API
- dbconn = self._entropy.open_generic_repository(
- dbpath, xcache = False, read_only = True,
- name = "live_client", indexing_override = False)
- return dbconn
-
- def _change_entropy_chroot(self, chroot = None):
- if not chroot:
- self._entropy._installed_repo_enable = True
- self._entropy.noclientdb = False
- else:
- self._entropy._installed_repo_enable = False
- self._entropy.noclientdb = True
- if chroot is None:
- chroot = ""
- self._entropy.switch_chroot(chroot)
- sys_settings_plg_id = etpConst['system_settings_plugins_ids']['client_plugin']
- del self._settings[sys_settings_plg_id]['misc']['configprotectskip'][:]
+ #def _open_live_installed_repository(self):
+ # dbpath = self._prod_root + etpConst['etpdatabaseclientfilepath']
+ # try:
+ # dbconn = self._entropy.open_generic_repository(
+ # dbpath, xcache = False, read_only = True,
+ # dbname = "live_client", indexing_override = False)
+ # except TypeError:
+ # # new API
+ # dbconn = self._entropy.open_generic_repository(
+ # dbpath, xcache = False, read_only = True,
+ # name = "live_client", indexing_override = False)
+ # return dbconn
+
+ #def _change_entropy_chroot(self, chroot = None):
+ # if not chroot:
+ # self._entropy._installed_repo_enable = True
+ # self._entropy.noclientdb = False
+ # else:
+ # self._entropy._installed_repo_enable = False
+ # self._entropy.noclientdb = True
+ # if chroot is None:
+ # chroot = ""
+ # self._entropy.switch_chroot(chroot)
+ # sys_settings_plg_id = etpConst['system_settings_plugins_ids']['client_plugin']
+ # del self._settings[sys_settings_plg_id]['misc']['configprotectskip'][:]
def install_package(self, atom, match = None, silent = False, fetch = False):
- if silent and os.getenv('GENTOO_DEBUG'):
- silent = False
-
- chroot = self._root
- root = etpSys['rootdir']
- if chroot != root:
- self._change_entropy_chroot(chroot)
-
- if match is None:
- match = self._entropy.atom_match(atom)
-
- oldstdout = sys.stdout
- if silent:
- sys.stdout = STDERR_LOG
- etpUi['mute'] = True
-
- try:
- rc = 0
- if match[0] != -1:
- Package = self._entropy.Package()
- action = "install"
- if fetch:
- action = "fetch"
- Package.prepare(match, action)
- rc = Package.run()
- Package.kill()
- finally:
- if silent:
- sys.stdout = oldstdout
- etpUi['mute'] = False
- if chroot != root:
- self._change_entropy_chroot(root)
-
- return rc
-
+ #if silent and os.getenv('GENTOO_DEBUG'):
+ # silent = False
+
+ #chroot = self._root
+ #root = etpSys['rootdir']
+ # Doesn't matter, Portage chroots in the terminal if needed
+ #if chroot != root:
+ # self._change_entropy_chroot(chroot)
+
+ #if match is None:
+ # match = self._entropy.atom_match(atom)
+ #oldstdout = sys.stdout
+
+ #if silent:
+ # sys.stdout = STDERR_LOG
+ # etpUi['mute'] = True
+
+ #try:
+ # rc = 0
+ # if match[0] != -1:
+ # Package = self._entropy.Package()
+ # action = "install"
+ # if fetch:
+ # action = "fetch"
+ # Package.prepare(match, action)
+ # rc = Package.run()
+ # Package.kill()
+ #finally:
+ # if silent:
+ # sys.stdout = oldstdout
+ # etpUi['mute'] = False
+ # if chroot != root:
+ # self._change_entropy_chroot(root)
+
+ return self._portage.install(atom)
+
+ # TODO: We don't remove anything from stage3
def remove_package(self, atom, match = None, silent = False):
- if silent and os.getenv('GENTOO_DEBUG'):
- silent = False
-
- chroot = self._root
- root = etpSys['rootdir']
- if chroot != root:
- self._change_entropy_chroot(chroot)
-
- if match is None:
- match = self._entropy.installed_repository().atomMatch(atom)
-
- oldstdout = sys.stdout
- if silent:
- sys.stdout = STDERR_LOG
- etpUi['mute'] = True
-
- try:
- rc = 0
- if match[0] != -1:
- Package = self._entropy.Package()
- Package.prepare((match[0],), "remove")
- if 'remove_installed_vanished' not in Package.pkgmeta:
- rc = Package.run()
- Package.kill()
- finally:
- if silent:
- sys.stdout = oldstdout
- etpUi['mute'] = False
-
- if chroot != root:
- self._change_entropy_chroot(root)
-
- return rc
-
- def install_package_file(self, package_file):
- chroot = self._root
- root = etpSys['rootdir']
- if chroot != root:
- self._change_entropy_chroot(chroot)
-
- try:
- atomsfound = self._entropy.add_package_repository(
- package_file)
- except EntropyPackageException:
- return -1
- repo = 0
- for match in atomsfound:
- repo = match[1]
- Package = self._entropy.Package()
- Package.prepare(match, "install")
- rc2 = Package.run()
- if rc2 != 0:
- if chroot != root:
- self._change_entropy_chroot(root)
- return rc2
- Package.kill()
-
- if chroot != root:
- self._change_entropy_chroot(root)
-
- if repo != 0:
- self._entropy.remove_repository(repo)
-
- return 0
-
- def _configure_skel(self):
+ # if silent and os.getenv('GENTOO_DEBUG'):
+ # silent = False
+
+ # chroot = self._root
+ # root = etpSys['rootdir']
+ # if chroot != root:
+ # self._change_entropy_chroot(chroot)
+
+ # if match is None:
+ # match = self._entropy.installed_repository().atomMatch(atom)
+
+ # oldstdout = sys.stdout
+ # if silent:
+ # sys.stdout = STDERR_LOG
+ # etpUi['mute'] = True
+
+ # try:
+ # rc = 0
+ # if match[0] != -1:
+ # Package = self._entropy.Package()
+ # Package.prepare((match[0],), "remove")
+ # if 'remove_installed_vanished' not in Package.pkgmeta:
+ # rc = Package.run()
+ # Package.kill()
+ # finally:
+ # if silent:
+ # sys.stdout = oldstdout
+ # etpUi['mute'] = False
+
+ # if chroot != root:
+ # self._change_entropy_chroot(root)
+
+ return self._portage.remove(atom)
+
+ #def install_package_file(self, package_file):
+ # chroot = self._root
+ # root = etpSys['rootdir']
+ # if chroot != root:
+ # self._change_entropy_chroot(chroot)
+
+ # try:
+ # atomsfound = self._entropy.add_package_repository(
+ # package_file)
+ # except EntropyPackageException:
+ # return -1
+ # repo = 0
+ # for match in atomsfound:
+ # repo = match[1]
+ # Package = self._entropy.Package()
+ # Package.prepare(match, "install")
+ # rc2 = Package.run()
+ # if rc2 != 0:
+ # if chroot != root:
+ # self._change_entropy_chroot(root)
+ # return rc2
+ # Package.kill()
+
+ # if chroot != root:
+ # self._change_entropy_chroot(root)
+
+ # if repo != 0:
+ # self._entropy.remove_repository(repo)
+
+ # return 0
+
+ #def _configure_skel(self):
# copy Sulfur on the desktop
- sulfur_desktop = self._root+"/usr/share/applications/sulfur.desktop"
- if os.path.isfile(sulfur_desktop):
- sulfur_user_desktop = self._root+"/etc/skel/Desktop/sulfur.desktop"
- shutil.copy2(sulfur_desktop, sulfur_user_desktop)
- try:
- os.chmod(sulfur_user_desktop, 0775)
- except OSError:
- pass
-
- gparted_desktop = self._root+"/etc/skel/Desktop/gparted.desktop"
- if os.path.isfile(gparted_desktop):
- os.remove(gparted_desktop)
-
- installer_desk = self._root+"/etc/skel/Desktop/liveinst.desktop"
- if os.path.isfile(installer_desk):
- os.remove(installer_desk)
-
- # install welcome loader
- orig_welcome_desk = self._root+"/etc/gentoo/gentoo-welcome-loader.desktop"
- if os.path.isfile(orig_welcome_desk):
- autostart_dir = self._root+"/etc/skel/.config/autostart"
- if not os.path.isdir(autostart_dir):
- os.makedirs(autostart_dir)
- desk_name = os.path.basename(orig_welcome_desk)
- desk_path = os.path.join(autostart_dir, desk_name)
- shutil.copy2(orig_welcome_desk, desk_path)
+ # sulfur_desktop = self._root+"/usr/share/applications/sulfur.desktop"
+ # if os.path.isfile(sulfur_desktop):
+ # sulfur_user_desktop = self._root+"/etc/skel/Desktop/sulfur.desktop"
+ # shutil.copy2(sulfur_desktop, sulfur_user_desktop)
+ # try:
+ # os.chmod(sulfur_user_desktop, 0775)
+ # except OSError:
+ # pass
+
+ # gparted_desktop = self._root+"/etc/skel/Desktop/gparted.desktop"
+ # if os.path.isfile(gparted_desktop):
+ # os.remove(gparted_desktop)
+
+ # installer_desk = self._root+"/etc/skel/Desktop/liveinst.desktop"
+ # if os.path.isfile(installer_desk):
+ # os.remove(installer_desk)
+
+ # # install welcome loader
+ # orig_welcome_desk = self._root+"/etc/gentoo/gentoo-welcome-loader.desktop"
+ # if os.path.isfile(orig_welcome_desk):
+ # autostart_dir = self._root+"/etc/skel/.config/autostart"
+ # if not os.path.isdir(autostart_dir):
+ # os.makedirs(autostart_dir)
+ # desk_name = os.path.basename(orig_welcome_desk)
+ # desk_path = os.path.join(autostart_dir, desk_name)
+ # shutil.copy2(orig_welcome_desk, desk_path)
def _is_virtualbox(self):
if not os.path.isfile("/etc/init.d/virtualbox-guest-additions"):
@@ -424,20 +421,8 @@ class GentooInstall:
action = _("Configuring System Services")
self._progress.set_text(action)
- is_gentoo_mce = "1"
- if not Entropy.is_gentoo_mce():
- is_gentoo_mce = "0"
-
- # Remove Installer services
+ # Installer services
config_script = """
- rc-update del installer-gui boot default
- rm -f /etc/init.d/installer-gui
- rc-update del installer-text boot default
- rm -f /etc/init.d/installer-text
- rc-update del music boot default
- rm -f /etc/init.d/music
- rc-update del gentoolive boot default
- rm -f /etc/init.d/gentoolive
rc-update add vixie-cron default
if [ ! -e "/etc/init.d/net.eth0" ]; then
cd /etc/init.d && ln -s net.lo net.eth0
@@ -454,10 +439,6 @@ class GentooInstall:
if [ -e "/etc/init.d/oemsystem-default" ]; then
rc-update add oemsystem-default default
fi
- if [ "0" = """+is_gentoo_mce+""" ]; then
- rc-update del gentoo-mce boot
- rc-update del gentoo-mce default
- fi
"""
self.spawn_chroot(config_script, silent = True)
@@ -479,6 +460,7 @@ class GentooInstall:
"cp -p /etc/modules.d/blacklist %s/etc/modules.d/blacklist" % (
self._root,))
+ # TODO: Check this after we have X working
def remove_proprietary_drivers(self):
"""
Detect a possible OSS video card and remove /etc/env.d/*ati
@@ -734,9 +716,9 @@ class GentooInstall:
# mask all the nvidia-drivers, this avoids having people
# updating their drivers resulting in a non working system
mask_file = os.path.join(self._root+'/',
- "etc/entropy/packages/package.mask")
+ "etc/portage/packages/package.mask")
unmask_file = os.path.join(self._root+'/',
- "etc/entropy/packages/package.unmask")
+ "etc/portage/packages/package.unmask")
if os.access(mask_file, os.W_OK) and os.path.isfile(mask_file):
f = open(mask_file,"aw")
f.write("\n# added by Gentoo Installer\nx11-drivers/nvidia-drivers\n")
@@ -782,22 +764,16 @@ class GentooInstall:
def emit_install_done(self):
# user installed Gentoo, w00hooh!
- try:
- webserv = self._get_entropy_webservice()
- except WebService.UnsupportedService:
- return
- try:
- webserv.add_downloads(["installer"])
- except Exception as err:
- log.error("Unable to emit_install_done(): %s" % err)
+ pass
def live_install(self):
"""
- This function copy the LiveCD/DVD content into self._root
+ This function copies the stage3 into self._root
"""
- if not os.getenv("GENTOO_DISABLE_PKG_REMOVAL"):
- self._setup_packages_to_remove()
+ # We don't remove stuff from the stage3
+ #if not os.getenv("GENTOO_DISABLE_PKG_REMOVAL"):
+ # self._setup_packages_to_remove()
action = _("System Installation")
copy_update_interval = 300
@@ -921,42 +897,42 @@ class GentooInstall:
self._change_entropy_chroot(self._root)
# doing here, because client_repo should point to self._root chroot
client_repo = self._entropy.installed_repository()
- # Removing Unwanted Packages
- if self._package_identifiers_to_remove:
+ # NOT Removing Unwanted Packages
+ #if self._package_identifiers_to_remove:
# this makes packages removal much faster
- client_repo.createAllIndexes()
+ # client_repo.createAllIndexes()
- total_counter = len(self._package_identifiers_to_remove)
- current_counter = 0
- self._progress.set_fraction(current_counter)
- self._progress.set_text(_("Cleaning packages"))
- self._entropy.oldcount = [0,total_counter]
+ # total_counter = len(self._package_identifiers_to_remove)
+ # current_counter = 0
+ # self._progress.set_fraction(current_counter)
+ # self._progress.set_text(_("Cleaning packages"))
+ # self._entropy.oldcount = [0,total_counter]
- for pkg_id in self._package_identifiers_to_remove:
- current_counter += 1
- atom = client_repo.retrieveAtom(pkg_id)
- if not atom:
- continue
+ # for pkg_id in self._package_identifiers_to_remove:
+ # current_counter += 1
+ # atom = client_repo.retrieveAtom(pkg_id)
+ # if not atom:
+ # continue
### XXX needed to speed up removal process
#"""
- category = client_repo.retrieveCategory(pkg_id)
- version = client_repo.retrieveVersion(pkg_id)
- name = client_repo.retrieveName(pkg_id)
- ebuild_path = self._root+"/var/db/pkg/%s/%s-%s" % (
- category, name, version)
- if os.path.isdir(ebuild_path):
- shutil.rmtree(ebuild_path, True)
+ # category = client_repo.retrieveCategory(pkg_id)
+ # version = client_repo.retrieveVersion(pkg_id)
+ # name = client_repo.retrieveName(pkg_id)
+ # ebuild_path = self._root+"/var/db/pkg/%s/%s-%s" % (
+ # category, name, version)
+ # if os.path.isdir(ebuild_path):
+ # shutil.rmtree(ebuild_path, True)
#"""
### XXX
- self.remove_package(None, match = (pkg_id,0), silent = True)
- frac = float(current_counter)/total_counter
- self._progress.set_fraction(frac)
- self._progress.set_text("%s: %s" % (
- _("Cleaning package"), atom,))
- self._entropy.oldcount = [current_counter, total_counter]
+ # self.remove_package(None, match = (pkg_id,0), silent = True)
+ # frac = float(current_counter)/total_counter
+ # self._progress.set_fraction(frac)
+ # self._progress.set_text("%s: %s" % (
+ # _("Cleaning package"), atom,))
+ # self._entropy.oldcount = [current_counter, total_counter]
while 1:
change = False
@@ -978,184 +954,109 @@ class GentooInstall:
if not change:
break
+ # We don't do that on Gentoo
# list installed packages and setup a package set
- inst_packages = ['%s:%s\n' % (entropy.dep.dep_getkey(atom),slot,) \
- for idpk, atom, slot, revision in client_repo.listAllPackages(
- get_scope = True, order_by = "atom")]
+ #inst_packages = ['%s:%s\n' % (entropy.dep.dep_getkey(atom),slot,) \
+ # for idpk, atom, slot, revision in client_repo.listAllPackages(
+ # get_scope = True, order_by = "atom")]
# perfectly fine w/o self._root
- pkgset_dir = etpConst['confsetsdir']
- if not os.path.isdir(pkgset_dir):
- os.makedirs(pkgset_dir, 0755)
- set_name = "install_base"
- set_filepath = os.path.join(pkgset_dir, set_name)
- try:
- f = open(set_filepath,"w")
- f.writelines(inst_packages)
- f.flush()
- f.close()
- except (IOError,):
- pass
-
- self._change_entropy_chroot()
+ #pkgset_dir = etpConst['confsetsdir']
+ #if not os.path.isdir(pkgset_dir):
+ # os.makedirs(pkgset_dir, 0755)
+ #set_name = "install_base"
+ #set_filepath = os.path.join(pkgset_dir, set_name)
+ #try:
+ # f = open(set_filepath,"w")
+ # f.writelines(inst_packages)
+ # f.flush()
+ # f.close()
+ #except (IOError,):
+ # pass
+
+ #self._change_entropy_chroot()
self._progress.set_fraction(1)
self._progress.set_text(_("Installation complete"))
- def language_packs_install(self):
- langpacks = self._get_installable_language_packs()
- if not langpacks:
- # all fine already
- return
-
- question_text = _("The following language packs are available for "
- "download (you need Internet), would you like to install them?") + \
- " [" + ', '.join(sorted(langpacks)) + "]"
- buttons = [_("Yes"), _("No")]
- answer = self._intf.messageWindow(_("Language packs download"),
- question_text, custom_icon="question", type="custom",
- custom_buttons = buttons)
- if answer == 1: # No
- return
-
- chroot = self._root
- root = etpSys['rootdir']
- if chroot != root:
- self._change_entropy_chroot(chroot)
-
- try:
-
- # update repos
- done = self.update_entropy_repositories()
- if not done:
- return
-
- lang_matches = [self._entropy.atom_match(x) for x in langpacks]
- lang_matches = [x for x in lang_matches if x[0] != -1]
- if not lang_matches:
- msg = _("No language packs are available for download, sorry!")
- self._intf.messageWindow(_("Language packs"), msg,
- custom_icon="warning")
- return
+ #def language_packs_install(self):
+ # langpacks = self._get_installable_language_packs()
+ # if not langpacks:
+ # # all fine already
+ # return
+
+ # question_text = _("The following language packs are available for "
+ # "download (you need Internet), would you like to install them?") + \
+ # " [" + ', '.join(sorted(langpacks)) + "]"
+ # buttons = [_("Yes"), _("No")]
+ # answer = self._intf.messageWindow(_("Language packs download"),
+ # question_text, custom_icon="question", type="custom",
+ # custom_buttons = buttons)
+ # if answer == 1: # No
+ # return
+
+ # chroot = self._root
+ # root = etpSys['rootdir']
+ # if chroot != root:
+ # self._change_entropy_chroot(chroot)
+
+ # try:
+
+ # # update repos
+ # done = self.update_entropy_repositories()
+ # if not done:
+ # return
+
+ # lang_matches = [self._entropy.atom_match(x) for x in langpacks]
+ # lang_matches = [x for x in lang_matches if x[0] != -1]
+ # if not lang_matches:
+ # msg = _("No language packs are available for download, sorry!")
+ # self._intf.messageWindow(_("Language packs"), msg,
+ # custom_icon="warning")
+ # return
# calculate deps, use relaxed algo
- install_queue, conflicts_queue, status = \
- self._entropy.get_install_queue(lang_matches, False, False,
- relaxed = True)
- if status != 0:
- msg = _("No language packs are available for install, sorry!")
- self._intf.messageWindow(_("Language packs"), msg,
- custom_icon="warning")
- return
-
- # fetch packages
- for match in install_queue:
- dbc = self._entropy.open_repository(match[1])
- langpack = dbc.retrieveAtom(match[0])
- self._progress.set_text("%s: %s" % (
- _("Downloading package"), langpack,))
- self.install_package(None, match = match, silent = True,
- fetch = True)
-
- # install packages
- for match in install_queue:
- dbc = self._entropy.open_repository(match[1])
- langpack = dbc.retrieveAtom(match[0])
- self._progress.set_text("%s: %s" % (
- _("Installing package"), langpack,))
- self.install_package(None, match = match, silent = True)
-
- finally:
- if chroot != root:
- self._change_entropy_chroot(root)
-
- def setup_entropy_mirrors(self):
-
- if not hasattr(self._entropy, 'reorder_mirrors'):
- # Entropy version does not support it
- return
- # disable by default, pkg.gentoo.org was always selected
- # as first, causing massive bandwidth usage
- if not os.getenv('GENTOO_ENABLE_MIRROR_SORTING'):
- return
-
+ # install_queue, conflicts_queue, status = \
+ # self._entropy.get_install_queue(lang_matches, False, False,
+ # relaxed = True)
+ # if status != 0:
+ # msg = _("No language packs are available for install, sorry!")
+ # self._intf.messageWindow(_("Language packs"), msg,
+ # custom_icon="warning")
+ # return
+
+ # # fetch packages
+ # for match in install_queue:
+ # dbc = self._entropy.open_repository(match[1])
+ # langpack = dbc.retrieveAtom(match[0])
+ # self._progress.set_text("%s: %s" % (
+ # _("Downloading package"), langpack,))
+ # self.install_package(None, match = match, silent = True,
+ # fetch = True)
+
+ # # install packages
+ # for match in install_queue:
+ # dbc = self._entropy.open_repository(match[1])
+ # langpack = dbc.retrieveAtom(match[0])
+ # self._progress.set_text("%s: %s" % (
+ # _("Installing package"), langpack,))
+ # self.install_package(None, match = match, silent = True)
+
+ # finally:
+ # if chroot != root:
+ # self._change_entropy_chroot(root)
+
+ # TODO: Obviously make it do the thing
+ def setup_portage_mirrors(self):
self._progress.set_label("%s: %s" % (
- _("Reordering Entropy mirrors"), _("can take some time..."),))
-
- chroot = self._root
- root = etpSys['rootdir']
- if chroot != root:
- self._change_entropy_chroot(chroot)
- try:
- self._entropy.reorder_mirrors(REPO_NAME)
- except Exception as err:
- msg = "%s: %s" % (_("Error"), err)
- self._intf.messageWindow(_("Reordering Entropy mirrors"), msg,
- custom_icon="warning")
- finally:
- if chroot != root:
- self._change_entropy_chroot(root)
-
- def update_entropy_repositories(self):
-
- chroot = self._root
- root = etpSys['rootdir']
- if chroot != root:
- self._change_entropy_chroot(chroot)
-
- silent = True
- if os.getenv('GENTOO_DEBUG'):
- silent = False
- # XXX add stdout silence
- oldstdout = sys.stdout
- if silent:
- sys.stdout = STDERR_LOG
- etpUi['mute'] = True
-
- try:
- # fetch_security = False => avoid spamming stdout
- try:
- repo_intf = self._entropy.Repositories(fetch_security = False,
- entropy_updates_alert = False)
- except AttributeError:
- msg = "%s: %s" % (_('No repositories specified in'),
- etpConst['repositoriesconf'],)
- self._intf.messageWindow(_("Repositories update"), msg,
- custom_icon="warning")
- return False
- except Exception as e:
- msg = "%s: %s" % (_('Unhandled error'), e,)
- self._intf.messageWindow(_("Repositories update"), msg,
- custom_icon="warning")
- return False
-
- try:
- update_rc = repo_intf.sync()
- except Exception as e:
- msg = "%s: %s" % (_('Sync error'), e,)
- self._intf.messageWindow(_("Repositories update"), msg,
- custom_icon="warning")
- return False
-
- if repo_intf.sync_errors or (update_rc != 0):
- msg = _("Cannot download repositories right now, no big deal")
- self._intf.messageWindow(_("Repositories update"), msg,
- custom_icon="warning")
- return False
- return True
-
- finally:
+ _("Setting up mirrors"), _("not yet..."),))
- if silent:
- sys.stdout = oldstdout
- etpUi['mute'] = False
- self._entropy.close_repositories()
- self._settings.clear()
- if chroot != root:
- self._change_entropy_chroot(root)
-
- def _get_langpacks(self):
- return [x.strip() for x in LANGUAGE_PACKS.split("\n") if \
- (not x.strip().startswith("#")) and x.strip()]
+ def update_portage_repositories(self):
+ self._portage.sync()
+
+
+ #def _get_langpacks(self):
+ # return [x.strip() for x in LANGUAGE_PACKS.split("\n") if \
+ # (not x.strip().startswith("#")) and x.strip()]
def __get_langs(self):
def_lang = self._anaconda.instLanguage.instLang
@@ -1164,153 +1065,153 @@ class GentooInstall:
langs = [def_lang, def_lang_2]
return set(langs)
- def _get_removable_localized_packages(self):
- langpacks = self._get_langpacks()
- # get cur lang
- langs = self.__get_langs()
-
- new_langpacks = set()
- for langpack in langpacks:
- found = False
- for lang in langs:
- if langpack.endswith("-%s" % (lang,)):
- found = True
- break
- if not found:
- new_langpacks.add(langpack)
- langpacks = new_langpacks
-
- client_repo = self._entropy.installed_repository()
- for langpack in langpacks:
- matches, m_rc = client_repo.atomMatch(langpack, multiMatch = True)
- if m_rc != 0:
- continue
- for pkg_id in matches:
- valid = self._entropy.validate_package_removal(pkg_id)
- if not valid:
- continue
- yield pkg_id
-
- def _get_installable_language_packs(self):
- """
- Return a list of packages not available on the CD/DVD that
- could be downloaded and installed.
- """
- langpacks = self._get_langpacks()
+ #def _get_removable_localized_packages(self):
+ # langpacks = self._get_langpacks()
# get cur lang
- langs = self.__get_langs()
-
- new_langpacks = set()
- for langpack in langpacks:
- found = False
- for lang in langs:
- if langpack.endswith("-%s" % (lang,)):
- found = True
- break
- if found:
- new_langpacks.add(langpack)
- langpacks = new_langpacks
+ # langs = self.__get_langs()
+
+ # new_langpacks = set()
+ # for langpack in langpacks:
+ # found = False
+ # for lang in langs:
+ # if langpack.endswith("-%s" % (lang,)):
+ # found = True
+ # break
+ # if not found:
+ # new_langpacks.add(langpack)
+ # langpacks = new_langpacks
+
+ # client_repo = self._entropy.installed_repository()
+ # for langpack in langpacks:
+ # matches, m_rc = client_repo.atomMatch(langpack, multiMatch = True)
+ # if m_rc != 0:
+ # continue
+ # for pkg_id in matches:
+ # valid = self._entropy.validate_package_removal(pkg_id)
+ # if not valid:
+ # continue
+ # yield pkg_id
+
+ #def _get_installable_language_packs(self):
+ # """
+ # Return a list of packages not available on the CD/DVD that
+ # could be downloaded and installed.
+ # """
+ # langpacks = self._get_langpacks()
+ # # get cur lang
+ # langs = self.__get_langs()
+
+ # new_langpacks = set()
+ # for langpack in langpacks:
+ # found = False
+ # for lang in langs:
+ # if langpack.endswith("-%s" % (lang,)):
+ # found = True
+ # break
+ # if found:
+ # new_langpacks.add(langpack)
+ # langpacks = new_langpacks
# filter out unwanted packages
# see gentoo.const
- client_repo = self._entropy.installed_repository()
+ # client_repo = self._entropy.installed_repository()
# KDE
- matches, m_rc = client_repo.atomMatch("kde-base/kdebase-startkde")
- if m_rc != 0:
+ # matches, m_rc = client_repo.atomMatch("kde-base/kdebase-startkde")
+ # if m_rc != 0:
# remove kde* packages
- langpacks = [x for x in langpacks if x.find("kde") == -1]
+ # langpacks = [x for x in langpacks if x.find("kde") == -1]
# Openoffice
- matches, m_rc = client_repo.atomMatch("openoffice")
- if m_rc != 0:
+ # matches, m_rc = client_repo.atomMatch("openoffice")
+ # if m_rc != 0:
# remove openoffice* packages
- langpacks = [x for x in langpacks if x.find("openoffice") == -1]
+ # langpacks = [x for x in langpacks if x.find("openoffice") == -1]
# aspell
- matches, m_rc = client_repo.atomMatch("aspell")
- if m_rc != 0:
+ # matches, m_rc = client_repo.atomMatch("aspell")
+ # if m_rc != 0:
# remove aspell* packages
- langpacks = [x for x in langpacks if x.find("aspell") == -1]
+ # langpacks = [x for x in langpacks if x.find("aspell") == -1]
# man-pages
- matches, m_rc = client_repo.atomMatch("man-pages")
- if m_rc != 0:
+ # matches, m_rc = client_repo.atomMatch("man-pages")
+ # if m_rc != 0:
# remove man-pages* packages
- langpacks = [x for x in langpacks if x.find("man-pages") == -1]
+ # langpacks = [x for x in langpacks if x.find("man-pages") == -1]
- packs = []
- for langpack in langpacks:
- matches, m_rc = client_repo.atomMatch(langpack)
- if m_rc != 0:
- packs.append(langpack)
- return packs
+ # packs = []
+ # for langpack in langpacks:
+ # matches, m_rc = client_repo.atomMatch(langpack)
+ # if m_rc != 0:
+ # packs.append(langpack)
+ # return packs
- def _setup_packages_to_remove(self):
+ #def _setup_packages_to_remove(self):
# remove anaconda if installed
- client_repo = self._entropy.installed_repository()
- pkgs_rm = ["app-admin/anaconda", "app-misc/anaconda-runtime",
- "app-misc/anaconda-runtime-gui", "libselinux", "sys-process/audit"]
- for pkg_name in pkgs_rm:
- pkg_id, pkg_rc = client_repo.atomMatch(pkg_name)
- if pkg_id != -1:
- self._package_identifiers_to_remove.add(pkg_id)
-
- localized_pkgs = self._get_removable_localized_packages()
- if localized_pkgs:
- question_text = _("This medium contains many extra languages, "
- "would you like to keep them installed?")
- buttons = [_("Yes"), _("No")]
- answer = self._intf.messageWindow(_("Language packs installation"),
- question_text, custom_icon="question", type="custom",
- custom_buttons = buttons)
- if answer == 1:
- self._package_identifiers_to_remove.update(localized_pkgs)
-
- if self._package_identifiers_to_remove:
-
- current_counter = 0
- total_counter = len(self._package_identifiers_to_remove)
- self._progress.set_fraction(current_counter)
- self._progress.set_text(_("Generating list of files to copy"))
-
- for pkg in self._package_identifiers_to_remove:
- current_counter += 1
- self._progress.set_fraction(
- float(current_counter)/total_counter)
- # get its files
- mycontent = self._live_repo.retrieveContent(pkg,
- extended = True)
- mydirs = [x[0] for x in mycontent if x[1] == "dir"]
- for x in mydirs:
- if x.find("/usr/lib64") != -1:
- x = x.replace("/usr/lib64","/usr/lib")
- elif x.find("/lib64") != -1:
- x = x.replace("/lib64","/lib")
- self._add_file_to_ignore(x, "dir")
- mycontent = [x[0] for x in mycontent if x[1] == "obj"]
- for x in mycontent:
- if x.find("/usr/lib64") != -1:
- x = x.replace("/usr/lib64","/usr/lib")
- elif x.find("/lib64") != -1:
- x = x.replace("/lib64","/lib")
- self._add_file_to_ignore(x, "obj")
- del mycontent
-
- self._progress.set_fraction(1)
-
- if hasattr(self._files_db, "commit"):
- self._files_db.commit()
- else:
- self._files_db.commitChanges()
- if hasattr(self._files_db, "setIndexing"):
- self._files_db.setIndexing(True)
- else:
- self._files_db.indexing = True
- self._files_db.createAllIndexes()
-
- def _add_file_to_ignore(self, f_path, ctype):
- self._files_db._cursor().execute(
- 'INSERT into content VALUES (?,?,?)' , ( None, f_path, ctype, ))
+ # client_repo = self._entropy.installed_repository()
+ # pkgs_rm = ["app-admin/anaconda", "app-misc/anaconda-runtime",
+ # "app-misc/anaconda-runtime-gui", "libselinux", "sys-process/audit"]
+ # for pkg_name in pkgs_rm:
+ # pkg_id, pkg_rc = client_repo.atomMatch(pkg_name)
+ # if pkg_id != -1:
+ # self._package_identifiers_to_remove.add(pkg_id)
+
+ # localized_pkgs = self._get_removable_localized_packages()
+ # if localized_pkgs:
+ # question_text = _("This medium contains many extra languages, "
+ # "would you like to keep them installed?")
+ # buttons = [_("Yes"), _("No")]
+ # answer = self._intf.messageWindow(_("Language packs installation"),
+ # question_text, custom_icon="question", type="custom",
+ # custom_buttons = buttons)
+ # if answer == 1:
+ # self._package_identifiers_to_remove.update(localized_pkgs)
+
+ # if self._package_identifiers_to_remove:
+
+ # current_counter = 0
+ # total_counter = len(self._package_identifiers_to_remove)
+ # self._progress.set_fraction(current_counter)
+ # self._progress.set_text(_("Generating list of files to copy"))
+
+ # for pkg in self._package_identifiers_to_remove:
+ # current_counter += 1
+ # self._progress.set_fraction(
+ # float(current_counter)/total_counter)
+ # # get its files
+ # mycontent = self._live_repo.retrieveContent(pkg,
+ # extended = True)
+ # mydirs = [x[0] for x in mycontent if x[1] == "dir"]
+ # for x in mydirs:
+ # if x.find("/usr/lib64") != -1:
+ # x = x.replace("/usr/lib64","/usr/lib")
+ # elif x.find("/lib64") != -1:
+ # x = x.replace("/lib64","/lib")
+ # self._add_file_to_ignore(x, "dir")
+ # mycontent = [x[0] for x in mycontent if x[1] == "obj"]
+ # for x in mycontent:
+ # if x.find("/usr/lib64") != -1:
+ # x = x.replace("/usr/lib64","/usr/lib")
+ # elif x.find("/lib64") != -1:
+ # x = x.replace("/lib64","/lib")
+ # self._add_file_to_ignore(x, "obj")
+ # del mycontent
+
+ # self._progress.set_fraction(1)
+
+ # if hasattr(self._files_db, "commit"):
+ # self._files_db.commit()
+ # else:
+ # self._files_db.commitChanges()
+ # if hasattr(self._files_db, "setIndexing"):
+ # self._files_db.setIndexing(True)
+ # else:
+ # self._files_db.indexing = True
+ # self._files_db.createAllIndexes()
+
+ #def _add_file_to_ignore(self, f_path, ctype):
+ # self._files_db._cursor().execute(
+ # 'INSERT into content VALUES (?,?,?)' , ( None, f_path, ctype, ))
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-06-26 21:08 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-06-26 21:08 UTC (permalink / raw
To: gentoo-commits
commit: 9db7027043ecf1c415ddddb5343b49051e58db34
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jun 26 21:05:35 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jun 26 21:05:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=9db70270
Some Entropy still got away
---
gentoo/utils.py | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 2cc58ba..52abbff 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -757,10 +757,10 @@ class GentooInstall:
def env_update(self):
self.spawn_chroot("env-update &> /dev/null")
- def _get_entropy_webservice(self):
- factory = self._entropy.WebServices()
- webserv = factory.new(REPO_NAME)
- return webserv
+ #def _get_entropy_webservice(self):
+ # factory = self._entropy.WebServices()
+ # webserv = factory.new(REPO_NAME)
+ # return webserv
def emit_install_done(self):
# user installed Gentoo, w00hooh!
@@ -894,9 +894,9 @@ class GentooInstall:
self._progress.set_fraction(1)
- self._change_entropy_chroot(self._root)
+ #self._change_entropy_chroot(self._root)
# doing here, because client_repo should point to self._root chroot
- client_repo = self._entropy.installed_repository()
+ #client_repo = self._entropy.installed_repository()
# NOT Removing Unwanted Packages
#if self._package_identifiers_to_remove:
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-06-26 23:28 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-06-26 23:28 UTC (permalink / raw
To: gentoo-commits
commit: 58d7ccbcc18747046aedccd2f4ea4e1256452581
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jun 26 23:28:23 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jun 26 23:28:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=58d7ccbc
gentoo/utils.py: oops, left some Entropy cruft
---
gentoo/utils.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 52abbff..5ea499d 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -46,9 +46,9 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
STDERR_LOG = open("/tmp/anaconda.log","aw")
log = logging.getLogger("anaconda")
-class GentooProgress(Singleton):
+class GentooProgress:
- def init_singleton(self, anaconda):
+ def __init__(self, anaconda):
self._intf = anaconda.intf
self._display_mode = anaconda.displayMode
self._prog = self._intf.instProgress
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-06-26 23:40 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-06-26 23:40 UTC (permalink / raw
To: gentoo-commits
commit: 6227e19306664c7636d12bb80688e551a06600e8
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jun 26 23:40:01 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jun 26 23:40:01 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=6227e193
gentoo/utils.py: the Portage class needs a terminal instance
---
gentoo/utils.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 5ea499d..95fc3f8 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -174,7 +174,7 @@ class GentooInstall:
self._prod_root = productPath
self._intf = anaconda.intf
self._progress = GentooProgress(anaconda)
- self._portage = Portage()
+ self._portage = Portage(anaconda._intf.instProgress.terminal)
self._settings = SystemSettings()
with open("/proc/cmdline", "r") as cmd_f:
self.cmdline = cmd_f.readline().strip().split()
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-06-27 0:03 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-06-27 0:03 UTC (permalink / raw
To: gentoo-commits
commit: 7c3b3ed0e22c33c2274c85ab12b6a2c63cd25b86
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jun 27 00:03:29 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jun 27 00:03:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=7c3b3ed0
gentoo/utils.py: more cruft to go
---
gentoo/utils.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 95fc3f8..0303887 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -175,7 +175,8 @@ class GentooInstall:
self._intf = anaconda.intf
self._progress = GentooProgress(anaconda)
self._portage = Portage(anaconda._intf.instProgress.terminal)
- self._settings = SystemSettings()
+ # I'm wondering what's it actually for. ~w.
+ #self._settings = SystemSettings()
with open("/proc/cmdline", "r") as cmd_f:
self.cmdline = cmd_f.readline().strip().split()
#sys.stderr = STDERR_LOG
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-06-27 0:05 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-06-27 0:05 UTC (permalink / raw
To: gentoo-commits
commit: 56da28e967471a2005325b0cb700c32377c4ca5e
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jun 27 00:05:07 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jun 27 00:05:07 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=56da28e9
gentoo/utils.py: Removed _spawn_adimage() (how many times...)
---
gentoo/utils.py | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 0303887..ba3ddd1 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -60,7 +60,6 @@ class GentooProgress:
def _process_events(self):
self._prog.processEvents()
- self._spawn_adimage()
return self.__alive
def start(self):
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-06-27 0:20 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-06-27 0:20 UTC (permalink / raw
To: gentoo-commits
commit: 4e1d8fe93b557b161cb75b6289b2aeed541fab32
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jun 27 00:20:33 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jun 27 00:20:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=4e1d8fe9
gentoo/utils.py: more cruft (_files_db references)
---
gentoo/utils.py | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index ba3ddd1..1931aff 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -866,14 +866,14 @@ class GentooInstall:
if currentfile.startswith("/dev/"):
continue
- try:
+ #try:
# if file is in the ignore list
- if self._files_db.isFileAvailable(
- currentfile.decode('raw_unicode_escape')):
- continue
- except:
- import traceback
- traceback.print_exc()
+ # if self._files_db.isFileAvailable(
+ # currentfile.decode('raw_unicode_escape')):
+ # continue
+ #except:
+ # import traceback
+ # traceback.print_exc()
tofile = self._root + currentfile
st_info = os.lstat(fromfile)
@@ -937,22 +937,22 @@ class GentooInstall:
while 1:
change = False
mydirs = set()
- try:
- mydirs = self._files_db.retrieveContent(None, contentType = "dir")
- except TypeError:
- mydirs = set([x for x, y in self._files_db.retrieveContent(None,
- extended = True) if y == "dir"])
- for mydir in mydirs:
- mytree = os.path.join(self._root,mydir)
- if os.path.isdir(mytree) and not client_repo.isFileAvailable(
- mydir):
- try:
- os.rmdir(mytree)
- change = True
- except OSError:
- pass
- if not change:
- break
+ #try:
+ # mydirs = self._files_db.retrieveContent(None, contentType = "dir")
+ #except TypeError:
+ # mydirs = set([x for x, y in self._files_db.retrieveContent(None,
+ # extended = True) if y == "dir"])
+ #for mydir in mydirs:
+ # mytree = os.path.join(self._root,mydir)
+ # if os.path.isdir(mytree) and not client_repo.isFileAvailable(
+ # mydir):
+ # try:
+ # os.rmdir(mytree)
+ # change = True
+ # except OSError:
+ # pass
+ #if not change:
+ # break
# We don't do that on Gentoo
# list installed packages and setup a package set
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-06-27 13:49 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-06-27 13:49 UTC (permalink / raw
To: gentoo-commits
commit: a4a519762964e16532439d63ae72062da09c3807
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jun 27 13:49:33 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jun 27 13:49:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=a4a51976
gentoo/__init__.py: fixed chroots
---
gentoo/__init__.py | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/gentoo/__init__.py b/gentoo/__init__.py
index 27ba852..3e59663 100644
--- a/gentoo/__init__.py
+++ b/gentoo/__init__.py
@@ -26,36 +26,34 @@ class Portage:
def __init__(self, terminal):
self.term = terminal
- # chroot into the new installation if not already there
- self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" 2> /dev/null")
# Syncs the Portage tree and updates Portage if an update is available
def sync(self):
- self.term.run_command("emerge --sync")
+ self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --sync")
if self.term.get_child_exit_status() != 0:
return False
- self.term.run_command("emerge --update portage")
+ self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --update portage")
if self.term.get_child_exit_status() == 0:
return True
return False
# Installs a package atom
def install(self, atom):
- self.term.run_command("emerge "+atom)
+ self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge "+atom)
if self.term.get_child_exit_status() == 0:
return True
return False
# Updates world
def update_world(self):
- self.term.run_command("emerge --deep --newuse --update world")
+ self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --deep --newuse --update world")
if self.term.get_child_exit_status() == 0:
return True
return False
# Removes a package atom
def remove(self, atom):
- self.term.run_command("emerge -C "+atom)
+ self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge -C "+atom)
if self.term.get_child_exit_status() == 0:
return True
return False
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-06-27 18:27 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-06-27 18:27 UTC (permalink / raw
To: gentoo-commits
commit: 99123d229d12d52a6ecd88dbe5f1f619aa2c398d
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jun 27 18:27:04 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jun 27 18:27:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=99123d22
gentoo/__init__.py: added some crude debug
---
gentoo/__init__.py | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/gentoo/__init__.py b/gentoo/__init__.py
index 3e59663..594214c 100644
--- a/gentoo/__init__.py
+++ b/gentoo/__init__.py
@@ -25,13 +25,16 @@ import sys
class Portage:
def __init__(self, terminal):
+ print "Portage init!"
self.term = terminal
# Syncs the Portage tree and updates Portage if an update is available
def sync(self):
+ print "chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --sync"
self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --sync")
if self.term.get_child_exit_status() != 0:
return False
+ print "chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --update portage"
self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --update portage")
if self.term.get_child_exit_status() == 0:
return True
@@ -39,6 +42,7 @@ class Portage:
# Installs a package atom
def install(self, atom):
+ print "chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge "+atom
self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge "+atom)
if self.term.get_child_exit_status() == 0:
return True
@@ -46,6 +50,7 @@ class Portage:
# Updates world
def update_world(self):
+ print "chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --deep --newuse --update world"
self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --deep --newuse --update world")
if self.term.get_child_exit_status() == 0:
return True
@@ -53,6 +58,7 @@ class Portage:
# Removes a package atom
def remove(self, atom):
+ print "chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge -C "+atom
self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge -C "+atom)
if self.term.get_child_exit_status() == 0:
return True
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-06-27 19:20 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-06-27 19:20 UTC (permalink / raw
To: gentoo-commits
commit: 85c5ad4d3eaa4bdbdd4c8a7aa1b475b2d9e0ef58
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jun 27 19:19:57 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jun 27 19:19:57 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=85c5ad4d
gentoo/utils.py: OMG FIXED AN INFINITE LOOP
---
gentoo/utils.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 1931aff..896acc0 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -934,9 +934,9 @@ class GentooInstall:
# _("Cleaning package"), atom,))
# self._entropy.oldcount = [current_counter, total_counter]
- while 1:
- change = False
- mydirs = set()
+ #while 1:
+ # change = False
+ # mydirs = set()
#try:
# mydirs = self._files_db.retrieveContent(None, contentType = "dir")
#except TypeError:
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-04 16:59 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 16:59 UTC (permalink / raw
To: gentoo-commits
commit: 8d81d5ba98c2c9d99c1d4393b190704c9b8ea2b0
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 16:59:10 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 16:59:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=8d81d5ba
gentoo/utils.py: Leave skel alone
---
gentoo/utils.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 896acc0..2f440bd 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -373,7 +373,8 @@ class GentooInstall:
# return 0
- #def _configure_skel(self):
+ def _configure_skel(self):
+ pass
# copy Sulfur on the desktop
# sulfur_desktop = self._root+"/usr/share/applications/sulfur.desktop"
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-04 20:52 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 20:52 UTC (permalink / raw
To: gentoo-commits
commit: 738fa1b2b589d978330258dc4cff0f80c0ee9378
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 20:51:38 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 20:51:38 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=738fa1b2
Install system-config-* to help Anaconda set up the new system
---
gentoo/livecd.py | 5 +++++
gentoo/utils.py | 15 +++++++++++----
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index 388d889..da5b5b9 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -114,6 +114,11 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
# Actually install
self._gentoo_install.live_install()
+
+ # Now copy the portage tree
+ self._gentoo_install.copy_portage()
+ self._gentoo_install.emerge_setup_tools()
+
self._gentoo_install.setup_users()
self._gentoo_install.setup_language() # before ldconfig, thx
# if simple networking is enabled, disable NetworkManager
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 2f440bd..23d53df 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -174,7 +174,7 @@ class GentooInstall:
self._intf = anaconda.intf
self._progress = GentooProgress(anaconda)
self._portage = Portage(anaconda._intf.instProgress.terminal)
- # I'm wondering what's it actually for. ~w.
+ # I'm wondering what's it actually for. ~w.
#self._settings = SystemSettings()
with open("/proc/cmdline", "r") as cmd_f:
self.cmdline = cmd_f.readline().strip().split()
@@ -1051,9 +1051,16 @@ class GentooInstall:
self._progress.set_label("%s: %s" % (
_("Setting up mirrors"), _("not yet..."),))
- def update_portage_repositories(self):
- self._portage.sync()
-
+ def copy_portage(self):
+ self._progress.set_fraction(0.0)
+ self._progress.set_text(_"Copying the Portage tree")
+ subprocess.Popen("cp", "--recursive", "/usr/portage", self._root+"/usr/")
+ # We need some packages from anaconda-overlay but ideally they should be added to portage
+ self._progress.set_fraction(0.5)
+ subprocess.Popen("cp", "--recursive", "/anaconda-overlay", self._root+"/usr/portage")
+
+ def install_setup_tools(self):
+ self._portage.install("system-config-date system-config-keyboard system-config-users")
#def _get_langpacks(self):
# return [x.strip() for x in LANGUAGE_PACKS.split("\n") if \
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-04 20:56 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 20:56 UTC (permalink / raw
To: gentoo-commits
commit: 1efe266a04d68f3a821effb9f7970d9c6acc1056
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 20:56:36 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 20:56:36 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=1efe266a
Install configuration helpers
---
gentoo/livecd.py | 2 +-
gentoo/utils.py | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index da5b5b9..19e755d 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -117,7 +117,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
# Now copy the portage tree
self._gentoo_install.copy_portage()
- self._gentoo_install.emerge_setup_tools()
+ self._gentoo_install.install_setup_tools()
self._gentoo_install.setup_users()
self._gentoo_install.setup_language() # before ldconfig, thx
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 23d53df..a98bc5b 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1061,6 +1061,7 @@ class GentooInstall:
def install_setup_tools(self):
self._portage.install("system-config-date system-config-keyboard system-config-users")
+ self._portage.install("keyboard-configuration-helpers language-configuration-helpers")
#def _get_langpacks(self):
# return [x.strip() for x in LANGUAGE_PACKS.split("\n") if \
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-04 21:02 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 21:02 UTC (permalink / raw
To: gentoo-commits
commit: 64f1cc6c843672e9e0fff33ff033eb41b817adf2
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 21:02:16 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 21:02:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=64f1cc6c
gentoo/utils.py: fixed _() macro
---
gentoo/utils.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index a98bc5b..ec77e04 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1053,7 +1053,7 @@ class GentooInstall:
def copy_portage(self):
self._progress.set_fraction(0.0)
- self._progress.set_text(_"Copying the Portage tree")
+ self._progress.set_text(_("Copying the Portage tree"))
subprocess.Popen("cp", "--recursive", "/usr/portage", self._root+"/usr/")
# We need some packages from anaconda-overlay but ideally they should be added to portage
self._progress.set_fraction(0.5)
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-04 21:19 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 21:19 UTC (permalink / raw
To: gentoo-commits
commit: 7334088cbdd833f618e7649eaf72c77482f08ed6
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 21:18:54 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 21:18:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=7334088c
gentoo/utils.py: use call() in copy_portage
---
gentoo/utils.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index ec77e04..60c332a 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -777,8 +777,8 @@ class GentooInstall:
# self._setup_packages_to_remove()
action = _("System Installation")
- copy_update_interval = 300
- copy_update_counter = 299
+ copy_update_interval = 100
+ copy_update_counter = 99
# get file counters
total_files = 0
image_dir = self._prod_root
@@ -1054,10 +1054,10 @@ class GentooInstall:
def copy_portage(self):
self._progress.set_fraction(0.0)
self._progress.set_text(_("Copying the Portage tree"))
- subprocess.Popen("cp", "--recursive", "/usr/portage", self._root+"/usr/")
+ subprocess.call(["cp", "--recursive", "/usr/portage", self._root+"/usr/"])
# We need some packages from anaconda-overlay but ideally they should be added to portage
self._progress.set_fraction(0.5)
- subprocess.Popen("cp", "--recursive", "/anaconda-overlay", self._root+"/usr/portage")
+ subprocess.call(["cp", "--recursive", "/anaconda-overlay", self._root+"/usr/portage"])
def install_setup_tools(self):
self._portage.install("system-config-date system-config-keyboard system-config-users")
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-04 22:24 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 22:24 UTC (permalink / raw
To: gentoo-commits
commit: 3e4f4bc617fe6107ff661705ae359084c9311c12
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 21:41:26 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 21:41:26 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=3e4f4bc6
Set profile and update the progress bar
---
gentoo/livecd.py | 1 +
gentoo/utils.py | 27 ++++++++++++++++++++++-----
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index 19e755d..a59612c 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -118,6 +118,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
# Now copy the portage tree
self._gentoo_install.copy_portage()
self._gentoo_install.install_setup_tools()
+ self._gentoo_install.set_profile()
self._gentoo_install.setup_users()
self._gentoo_install.setup_language() # before ldconfig, thx
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 60c332a..af1f17e 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -777,8 +777,8 @@ class GentooInstall:
# self._setup_packages_to_remove()
action = _("System Installation")
- copy_update_interval = 100
- copy_update_counter = 99
+ copy_update_interval = 10
+ copy_update_counter = 9
# get file counters
total_files = 0
image_dir = self._prod_root
@@ -1053,15 +1053,32 @@ class GentooInstall:
def copy_portage(self):
self._progress.set_fraction(0.0)
- self._progress.set_text(_("Copying the Portage tree"))
+ self._progress.set_text(_("Copying the Portage tree (can take a long time)"))
subprocess.call(["cp", "--recursive", "/usr/portage", self._root+"/usr/"])
# We need some packages from anaconda-overlay but ideally they should be added to portage
self._progress.set_fraction(0.5)
subprocess.call(["cp", "--recursive", "/anaconda-overlay", self._root+"/usr/portage"])
+ self._progress.set_fraction(1)
def install_setup_tools(self):
- self._portage.install("system-config-date system-config-keyboard system-config-users")
- self._portage.install("keyboard-configuration-helpers language-configuration-helpers")
+ self._progress.set_fraction(0.0)
+ self._progress.set_text(_("Installing configuration helpers"))
+ self.install_package("system-config-date")
+ self._progress.set_fraction(0.2)
+ self.install_package("system-config-keyboard")
+ self._progress.set_fraction(0.4)
+ self.install_package("system-config-users")
+ self._progress.set_fraction(0.6)
+ self.install_package("keyboard-configuration-helpers")
+ self._progress.set_fraction(0.8)
+ self.install_package("language-configuration-helpers")
+ self._progress.set_fraction(1.0)
+
+ def set_profile(self):
+ self._progress.set_fraction(0.0)
+ self._progress.set_text(_("Setting profile %s" % self._anaconda.profile))
+ self.spawn_chroot("eselect profile set "+self._anaconda.profile)
+ self._progress.set_fraction(1.0)
#def _get_langpacks(self):
# return [x.strip() for x in LANGUAGE_PACKS.split("\n") if \
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-04 22:34 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 22:34 UTC (permalink / raw
To: gentoo-commits
commit: 3d0553ef9e63f876d1cdb9b269989e90abd66820
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 22:33:51 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 22:33:51 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=3d0553ef
Python being an indent nazi
---
gentoo/utils.py | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index af1f17e..856adf9 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1061,18 +1061,18 @@ class GentooInstall:
self._progress.set_fraction(1)
def install_setup_tools(self):
- self._progress.set_fraction(0.0)
+ self._progress.set_fraction(0.0)
self._progress.set_text(_("Installing configuration helpers"))
- self.install_package("system-config-date")
- self._progress.set_fraction(0.2)
- self.install_package("system-config-keyboard")
- self._progress.set_fraction(0.4)
- self.install_package("system-config-users")
- self._progress.set_fraction(0.6)
- self.install_package("keyboard-configuration-helpers")
- self._progress.set_fraction(0.8)
- self.install_package("language-configuration-helpers")
- self._progress.set_fraction(1.0)
+ self.install_package("system-config-date")
+ self._progress.set_fraction(0.2)
+ self.install_package("system-config-keyboard")
+ self._progress.set_fraction(0.4)
+ self.install_package("system-config-users")
+ self._progress.set_fraction(0.6)
+ self.install_package("keyboard-configuration-helpers")
+ self._progress.set_fraction(0.8)
+ self.install_package("language-configuration-helpers")
+ self._progress.set_fraction(1.0)
def set_profile(self):
self._progress.set_fraction(0.0)
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-04 22:47 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 22:47 UTC (permalink / raw
To: gentoo-commits
commit: c31c926b1bb5cf0e0529c485cf8ad51c89b7d9f4
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 22:47:21 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 22:47:21 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=c31c926b
indents again...
---
gentoo/utils.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 856adf9..5d3e28e 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1073,12 +1073,12 @@ class GentooInstall:
self._progress.set_fraction(0.8)
self.install_package("language-configuration-helpers")
self._progress.set_fraction(1.0)
-
- def set_profile(self):
- self._progress.set_fraction(0.0)
+
+ def set_profile(self):
+ self._progress.set_fraction(0.0)
self._progress.set_text(_("Setting profile %s" % self._anaconda.profile))
- self.spawn_chroot("eselect profile set "+self._anaconda.profile)
- self._progress.set_fraction(1.0)
+ self.spawn_chroot("eselect profile set "+self._anaconda.profile)
+ self._progress.set_fraction(1.0)
#def _get_langpacks(self):
# return [x.strip() for x in LANGUAGE_PACKS.split("\n") if \
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-05 12:53 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-05 12:53 UTC (permalink / raw
To: gentoo-commits
commit: 86a30921f02ae9fb14158db5d1d332b1a8eb324d
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 5 12:53:05 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 5 12:53:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=86a30921
gentoo/livecd.py: profile needs to be set before emerging
---
gentoo/livecd.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index a59612c..c4bf860 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -117,8 +117,8 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
# Now copy the portage tree
self._gentoo_install.copy_portage()
- self._gentoo_install.install_setup_tools()
self._gentoo_install.set_profile()
+ self._gentoo_install.install_setup_tools()
self._gentoo_install.setup_users()
self._gentoo_install.setup_language() # before ldconfig, thx
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-05 13:20 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-05 13:20 UTC (permalink / raw
To: gentoo-commits
commit: 28e71d41a5239708c6132892757adea8262044c0
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 5 13:19:56 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 5 13:19:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=28e71d41
debugging spawn_chroot
---
gentoo/livecd.py | 4 ++--
gentoo/utils.py | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index c4bf860..40c8005 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -111,12 +111,12 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
self._progress.set_label(_("Installing Gentoo onto hard drive."))
self._progress.set_fraction(0.0)
-
+
+ self._gentoo_install.copy_portage()
# Actually install
self._gentoo_install.live_install()
# Now copy the portage tree
- self._gentoo_install.copy_portage()
self._gentoo_install.set_profile()
self._gentoo_install.install_setup_tools()
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 5d3e28e..4dd6590 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -216,6 +216,7 @@ class GentooInstall:
pid = os.fork()
if pid == 0:
+ print "chrooting to "+self._root
os.chroot(self._root)
os.chdir("/")
do_shell = False
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-05 13:22 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-05 13:22 UTC (permalink / raw
To: gentoo-commits
commit: 2462eb350b6852a97ed0395443b954a0584ae5db
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 5 13:22:33 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 5 13:22:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=2462eb35
gentoo/utils.py: emerge -1 the config helpers
---
gentoo/utils.py | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 4dd6590..f557c0c 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1058,21 +1058,21 @@ class GentooInstall:
subprocess.call(["cp", "--recursive", "/usr/portage", self._root+"/usr/"])
# We need some packages from anaconda-overlay but ideally they should be added to portage
self._progress.set_fraction(0.5)
- subprocess.call(["cp", "--recursive", "/anaconda-overlay", self._root+"/usr/portage"])
+ subprocess.call(["cp", "--recursive", "/anaconda-overlay/*", self._root+"/usr/portage/"])
self._progress.set_fraction(1)
def install_setup_tools(self):
self._progress.set_fraction(0.0)
self._progress.set_text(_("Installing configuration helpers"))
- self.install_package("system-config-date")
+ self.install_package("-1 system-config-date")
self._progress.set_fraction(0.2)
- self.install_package("system-config-keyboard")
+ self.install_package("-1 system-config-keyboard")
self._progress.set_fraction(0.4)
- self.install_package("system-config-users")
+ self.install_package("-1 system-config-users")
self._progress.set_fraction(0.6)
- self.install_package("keyboard-configuration-helpers")
+ self.install_package("-1 keyboard-configuration-helpers")
self._progress.set_fraction(0.8)
- self.install_package("language-configuration-helpers")
+ self.install_package("-1 language-configuration-helpers")
self._progress.set_fraction(1.0)
def set_profile(self):
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-05 13:29 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-05 13:29 UTC (permalink / raw
To: gentoo-commits
commit: 8e765a10d00f435e5ef05d76519f459dfabe89ac
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 5 13:29:06 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 5 13:29:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=8e765a10
gentoo/utils.py: stupid editor putting tabs instead of spaces
---
gentoo/utils.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index f557c0c..904563a 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -216,7 +216,7 @@ class GentooInstall:
pid = os.fork()
if pid == 0:
- print "chrooting to "+self._root
+ print "chrooting to "+self._root
os.chroot(self._root)
os.chdir("/")
do_shell = False
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-05 13:55 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-05 13:55 UTC (permalink / raw
To: gentoo-commits
commit: 559bda2a9472f03be99235be80fe262e41b03663
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 5 13:54:57 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 5 13:54:57 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=559bda2a
Fix profile selection
---
gentoo/__init__.py | 18 +++++++-----------
gentoo/livecd.py | 8 ++++----
gentoo/utils.py | 5 ++---
3 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/gentoo/__init__.py b/gentoo/__init__.py
index 594214c..e01844b 100644
--- a/gentoo/__init__.py
+++ b/gentoo/__init__.py
@@ -24,42 +24,38 @@ import sys
class Portage:
- def __init__(self, terminal):
+ def __init__(self, terminal, root):
print "Portage init!"
self.term = terminal
+ self.root = root
# Syncs the Portage tree and updates Portage if an update is available
def sync(self):
- print "chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --sync"
- self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --sync")
+ self.term.run_command("chroot "+self.root+" emerge --sync")
if self.term.get_child_exit_status() != 0:
return False
- print "chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --update portage"
- self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --update portage")
+ self.term.run_command("chroot "+self.root+" emerge --update portage")
if self.term.get_child_exit_status() == 0:
return True
return False
# Installs a package atom
def install(self, atom):
- print "chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge "+atom
- self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge "+atom)
+ self.term.run_command("chroot "+self.root+" emerge "+atom)
if self.term.get_child_exit_status() == 0:
return True
return False
# Updates world
def update_world(self):
- print "chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --deep --newuse --update world"
- self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --deep --newuse --update world")
+ self.term.run_command("chroot "+self.root+" emerge --deep --newuse --update world")
if self.term.get_child_exit_status() == 0:
return True
return False
# Removes a package atom
def remove(self, atom):
- print "chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge -C "+atom
- self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge -C "+atom)
+ self.term.run_command("chroot "+self.root+" emerge -C "+atom)
if self.term.get_child_exit_status() == 0:
return True
return False
diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index 40c8005..c9e7402 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -57,8 +57,8 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
self._root = anaconda.rootPath
self.osimg = anaconda.methodstr[8:]
- # On Gentoo we're using a stage3 as an installation source
- # FIXME: Replace this with checking for stage3
+ # On Gentoo we're using a stage3 as an installation source
+ # FIXME: Replace this with checking for stage3
#if not os.path.ismount(self.osimg):
# anaconda.intf.messageWindow(_("Unable to find image"),
# _("The given location [%s] isn't a valid %s "
@@ -112,11 +112,11 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
self._progress.set_label(_("Installing Gentoo onto hard drive."))
self._progress.set_fraction(0.0)
- self._gentoo_install.copy_portage()
# Actually install
self._gentoo_install.live_install()
# Now copy the portage tree
+ self._gentoo_install.copy_portage()
self._gentoo_install.set_profile()
self._gentoo_install.install_setup_tools()
@@ -137,7 +137,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
self._gentoo_install.setup_audio()
self._gentoo_install.setup_xorg()
self._gentoo_install.remove_proprietary_drivers()
- # TODO: This needs to be tried and fixed properly on Gentoo once installing X works
+ # TODO: This needs to be tried and fixed properly on Gentoo once installing X works
try:
self._gentoo_install.setup_nvidia_legacy()
except Exception as e:
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 904563a..56ee310 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -173,7 +173,7 @@ class GentooInstall:
self._prod_root = productPath
self._intf = anaconda.intf
self._progress = GentooProgress(anaconda)
- self._portage = Portage(anaconda._intf.instProgress.terminal)
+ self._portage = Portage(anaconda._intf.instProgress.terminal, self._root)
# I'm wondering what's it actually for. ~w.
#self._settings = SystemSettings()
with open("/proc/cmdline", "r") as cmd_f:
@@ -216,7 +216,6 @@ class GentooInstall:
pid = os.fork()
if pid == 0:
- print "chrooting to "+self._root
os.chroot(self._root)
os.chdir("/")
do_shell = False
@@ -1074,7 +1073,7 @@ class GentooInstall:
self._progress.set_fraction(0.8)
self.install_package("-1 language-configuration-helpers")
self._progress.set_fraction(1.0)
-
+
def set_profile(self):
self._progress.set_fraction(0.0)
self._progress.set_text(_("Setting profile %s" % self._anaconda.profile))
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-05 14:07 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-05 14:07 UTC (permalink / raw
To: gentoo-commits
commit: 74726ef5376ed416b2804057c596eeaba51af2cf
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 5 14:07:10 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 5 14:07:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=74726ef5
gentoo/utils.py: fix copying additional tools to portage
---
gentoo/utils.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 56ee310..dc400c1 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1057,7 +1057,8 @@ class GentooInstall:
subprocess.call(["cp", "--recursive", "/usr/portage", self._root+"/usr/"])
# We need some packages from anaconda-overlay but ideally they should be added to portage
self._progress.set_fraction(0.5)
- subprocess.call(["cp", "--recursive", "/anaconda-overlay/*", self._root+"/usr/portage/"])
+ subprocess.call(["cp", "--recursive", "/anaconda-overlay/app-admin", self._root+"/usr/portage/"])
+ subprocess.call(["cp", "--recursive", "/anaconda-overlay/sys-apps", self._root+"/usr/portage/"])
self._progress.set_fraction(1)
def install_setup_tools(self):
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-05 14:31 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-05 14:31 UTC (permalink / raw
To: gentoo-commits
commit: 59170a50e519e4df76f4d3efcbbe72f034861c78
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 5 14:31:08 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 5 14:31:08 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=59170a50
gentoo/utils.py: copy more packages into the local portage tree
---
gentoo/utils.py | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index dc400c1..1969d42 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1058,7 +1058,13 @@ class GentooInstall:
# We need some packages from anaconda-overlay but ideally they should be added to portage
self._progress.set_fraction(0.5)
subprocess.call(["cp", "--recursive", "/anaconda-overlay/app-admin", self._root+"/usr/portage/"])
+ subprocess.call(["cp", "--recursive", "/anaconda-overlay/app-cdr", self._root+"/usr/portage/"])
+ subprocess.call(["cp", "--recursive", "/anaconda-overlay/app-misc", self._root+"/usr/portage/"])
+ subprocess.call(["cp", "--recursive", "/anaconda-overlay/dev-python", self._root+"/usr/portage/"])
+ subprocess.call(["cp", "--recursive", "/anaconda-overlay/dev-util", self._root+"/usr/portage/"])
subprocess.call(["cp", "--recursive", "/anaconda-overlay/sys-apps", self._root+"/usr/portage/"])
+ subprocess.call(["cp", "--recursive", "/anaconda-overlay/sys-block", self._root+"/usr/portage/"])
+ subprocess.call(["cp", "--recursive", "/anaconda-overlay/sys-libs", self._root+"/usr/portage/"])
self._progress.set_fraction(1)
def install_setup_tools(self):
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-05 15:38 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-05 15:38 UTC (permalink / raw
To: gentoo-commits
commit: c8bcb76be0986f5f3122a8dfbf0851908041cbc9
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 5 15:38:30 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 5 15:38:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=c8bcb76b
gentoo/utils.py: a nice trick to unmask packages temporarily
---
gentoo/utils.py | 50 ++++++++++----------------------------------------
1 files changed, 10 insertions(+), 40 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 1969d42..b10ebcf 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -268,42 +268,12 @@ class GentooInstall:
# del self._settings[sys_settings_plg_id]['misc']['configprotectskip'][:]
def install_package(self, atom, match = None, silent = False, fetch = False):
-
- #if silent and os.getenv('GENTOO_DEBUG'):
- # silent = False
-
- #chroot = self._root
- #root = etpSys['rootdir']
- # Doesn't matter, Portage chroots in the terminal if needed
- #if chroot != root:
- # self._change_entropy_chroot(chroot)
-
- #if match is None:
- # match = self._entropy.atom_match(atom)
- #oldstdout = sys.stdout
-
- #if silent:
- # sys.stdout = STDERR_LOG
- # etpUi['mute'] = True
-
- #try:
- # rc = 0
- # if match[0] != -1:
- # Package = self._entropy.Package()
- # action = "install"
- # if fetch:
- # action = "fetch"
- # Package.prepare(match, action)
- # rc = Package.run()
- # Package.kill()
- #finally:
- # if silent:
- # sys.stdout = oldstdout
- # etpUi['mute'] = False
- # if chroot != root:
- # self._change_entropy_chroot(root)
-
return self._portage.install(atom)
+
+ def install_masked_package(self, atom):
+ os.environ["ACCEPT_KEYWORDS"] = "~amd64 ~x86"
+ return self._portage.install(atom)
+ del os.environ["ACCEPT_KEYWORDS"]
# TODO: We don't remove anything from stage3
def remove_package(self, atom, match = None, silent = False):
@@ -1070,15 +1040,15 @@ class GentooInstall:
def install_setup_tools(self):
self._progress.set_fraction(0.0)
self._progress.set_text(_("Installing configuration helpers"))
- self.install_package("-1 system-config-date")
+ self.install_masked_package("-1 system-config-date")
self._progress.set_fraction(0.2)
- self.install_package("-1 system-config-keyboard")
+ self.install_masked_package("-1 system-config-keyboard")
self._progress.set_fraction(0.4)
- self.install_package("-1 system-config-users")
+ self.install_masked_package("-1 system-config-users")
self._progress.set_fraction(0.6)
- self.install_package("-1 keyboard-configuration-helpers")
+ self.install_masked_package("-1 keyboard-configuration-helpers")
self._progress.set_fraction(0.8)
- self.install_package("-1 language-configuration-helpers")
+ self.install_masked_package("-1 language-configuration-helpers")
self._progress.set_fraction(1.0)
def set_profile(self):
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-05 16:09 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-05 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 2588876d45b54fdde34ceb63416754cdc53796de
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 5 16:09:40 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 5 16:09:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=2588876d
gentoo/utils.py: Temporarily enable policykit
---
gentoo/utils.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index b10ebcf..bfed066 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1040,6 +1040,7 @@ class GentooInstall:
def install_setup_tools(self):
self._progress.set_fraction(0.0)
self._progress.set_text(_("Installing configuration helpers"))
+ os.environ["USE"] = "policykit"
self.install_masked_package("-1 system-config-date")
self._progress.set_fraction(0.2)
self.install_masked_package("-1 system-config-keyboard")
@@ -1050,6 +1051,7 @@ class GentooInstall:
self._progress.set_fraction(0.8)
self.install_masked_package("-1 language-configuration-helpers")
self._progress.set_fraction(1.0)
+ del os.environ["USE"]
def set_profile(self):
self._progress.set_fraction(0.0)
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-05 18:48 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-05 18:48 UTC (permalink / raw
To: gentoo-commits
commit: 9dd6738f1b83788699cf2376b0cbf64cd4ecb126
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 5 18:47:42 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 5 18:47:42 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=9dd6738f
gentoo/utils.py: copy /etc/resolv.conf
---
gentoo/utils.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index bfed066..fcf8ede 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1040,6 +1040,7 @@ class GentooInstall:
def install_setup_tools(self):
self._progress.set_fraction(0.0)
self._progress.set_text(_("Installing configuration helpers"))
+ shutil.copy2("/etc/resolv.conf", self._root+"/etc/")
os.environ["USE"] = "policykit"
self.install_masked_package("-1 system-config-date")
self._progress.set_fraction(0.2)
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-05 20:45 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-05 20:45 UTC (permalink / raw
To: gentoo-commits
commit: 1bfbb5f94560965816ee009f9780b8721f362713
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 5 20:45:02 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 5 20:45:02 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=1bfbb5f9
gentoo/utils.py: install_setup_tools: filter out some USE flags
---
gentoo/utils.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index fcf8ede..42671b2 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1041,7 +1041,7 @@ class GentooInstall:
self._progress.set_fraction(0.0)
self._progress.set_text(_("Installing configuration helpers"))
shutil.copy2("/etc/resolv.conf", self._root+"/etc/")
- os.environ["USE"] = "policykit"
+ os.environ["USE"] = "policykit -gtk -X "
self.install_masked_package("-1 system-config-date")
self._progress.set_fraction(0.2)
self.install_masked_package("-1 system-config-keyboard")
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-06 11:19 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-06 11:19 UTC (permalink / raw
To: gentoo-commits
commit: 9b76711a334f626fe7c6749f2abffacd92c6a03c
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Jul 6 11:18:21 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Jul 6 11:18:21 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=9b76711a
gentoo/utils.py: skip _get_langpacks()
---
gentoo/utils.py | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 42671b2..4afed3f 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1060,9 +1060,8 @@ class GentooInstall:
self.spawn_chroot("eselect profile set "+self._anaconda.profile)
self._progress.set_fraction(1.0)
- #def _get_langpacks(self):
- # return [x.strip() for x in LANGUAGE_PACKS.split("\n") if \
- # (not x.strip().startswith("#")) and x.strip()]
+ def _get_langpacks(self):
+ return None
def __get_langs(self):
def_lang = self._anaconda.instLanguage.instLang
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-06 11:51 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-06 11:51 UTC (permalink / raw
To: gentoo-commits
commit: 275f0e70eb1c33affa5a61fbed790fd8df91ba4e
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Jul 6 11:51:21 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Jul 6 11:51:21 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=275f0e70
gentoo/utils.py: install_setup_tools: fliter some more flags
---
gentoo/utils.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 4afed3f..a959b6e 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1041,7 +1041,7 @@ class GentooInstall:
self._progress.set_fraction(0.0)
self._progress.set_text(_("Installing configuration helpers"))
shutil.copy2("/etc/resolv.conf", self._root+"/etc/")
- os.environ["USE"] = "policykit -gtk -X "
+ os.environ["USE"] = "policykit -gtk -X -gpm "
self.install_masked_package("-1 system-config-date")
self._progress.set_fraction(0.2)
self.install_masked_package("-1 system-config-keyboard")
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-06 14:31 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-06 14:31 UTC (permalink / raw
To: gentoo-commits
commit: 9076704c42a0336e030ec2caf8db6a796042a994
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Jul 6 14:31:25 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Jul 6 14:31:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=9076704c
gentoo/utils.py: Don't unmask everything
---
gentoo/utils.py | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index a959b6e..9b0507c 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1041,16 +1041,20 @@ class GentooInstall:
self._progress.set_fraction(0.0)
self._progress.set_text(_("Installing configuration helpers"))
shutil.copy2("/etc/resolv.conf", self._root+"/etc/")
- os.environ["USE"] = "policykit -gtk -X -gpm "
- self.install_masked_package("-1 system-config-date")
+ os.environ["USE"] = "policykit -gtk -X -gpm"
+ os.mkdir(self._root+"/etc/portage")
+ keywordsf = open(self._root+"/etc/portage/package.keywords", "w")
+ keywordsf.write("dev-python/rhpl ~amd64\n")
+ keywordsf.close()
+ self.install_package("-1 system-config-date")
self._progress.set_fraction(0.2)
- self.install_masked_package("-1 system-config-keyboard")
+ self.install_package("-1 system-config-keyboard")
self._progress.set_fraction(0.4)
- self.install_masked_package("-1 system-config-users")
+ self.install_package("-1 system-config-users")
self._progress.set_fraction(0.6)
- self.install_masked_package("-1 keyboard-configuration-helpers")
+ self.install_package("-1 keyboard-configuration-helpers")
self._progress.set_fraction(0.8)
- self.install_masked_package("-1 language-configuration-helpers")
+ self.install_package("-1 language-configuration-helpers")
self._progress.set_fraction(1.0)
del os.environ["USE"]
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-06 16:42 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-06 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 5f633eaeae25bdfb48602645983762b82765ac30
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Jul 6 16:42:28 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Jul 6 16:42:28 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=5f633eae
gentoo/utils.py: language_packs_install: dummy
---
gentoo/utils.py | 68 +-----------------------------------------------------
1 files changed, 2 insertions(+), 66 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 9b0507c..e689f68 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -949,73 +949,9 @@ class GentooInstall:
self._progress.set_fraction(1)
self._progress.set_text(_("Installation complete"))
- #def language_packs_install(self):
- # langpacks = self._get_installable_language_packs()
- # if not langpacks:
- # # all fine already
- # return
-
- # question_text = _("The following language packs are available for "
- # "download (you need Internet), would you like to install them?") + \
- # " [" + ', '.join(sorted(langpacks)) + "]"
- # buttons = [_("Yes"), _("No")]
- # answer = self._intf.messageWindow(_("Language packs download"),
- # question_text, custom_icon="question", type="custom",
- # custom_buttons = buttons)
- # if answer == 1: # No
- # return
-
- # chroot = self._root
- # root = etpSys['rootdir']
- # if chroot != root:
- # self._change_entropy_chroot(chroot)
-
- # try:
+ def language_packs_install(self):
+ return
- # # update repos
- # done = self.update_entropy_repositories()
- # if not done:
- # return
-
- # lang_matches = [self._entropy.atom_match(x) for x in langpacks]
- # lang_matches = [x for x in lang_matches if x[0] != -1]
- # if not lang_matches:
- # msg = _("No language packs are available for download, sorry!")
- # self._intf.messageWindow(_("Language packs"), msg,
- # custom_icon="warning")
- # return
-
- # calculate deps, use relaxed algo
- # install_queue, conflicts_queue, status = \
- # self._entropy.get_install_queue(lang_matches, False, False,
- # relaxed = True)
- # if status != 0:
- # msg = _("No language packs are available for install, sorry!")
- # self._intf.messageWindow(_("Language packs"), msg,
- # custom_icon="warning")
- # return
-
- # # fetch packages
- # for match in install_queue:
- # dbc = self._entropy.open_repository(match[1])
- # langpack = dbc.retrieveAtom(match[0])
- # self._progress.set_text("%s: %s" % (
- # _("Downloading package"), langpack,))
- # self.install_package(None, match = match, silent = True,
- # fetch = True)
-
- # # install packages
- # for match in install_queue:
- # dbc = self._entropy.open_repository(match[1])
- # langpack = dbc.retrieveAtom(match[0])
- # self._progress.set_text("%s: %s" % (
- # _("Installing package"), langpack,))
- # self.install_package(None, match = match, silent = True)
-
- # finally:
- # if chroot != root:
- # self._change_entropy_chroot(root)
-
# TODO: Obviously make it do the thing
def setup_portage_mirrors(self):
self._progress.set_label("%s: %s" % (
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-06 18:20 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-06 18:20 UTC (permalink / raw
To: gentoo-commits
commit: 8a88478fb1b255abe726abbf6bddbe4ed1abbf7f
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Jul 6 18:19:45 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Jul 6 18:19:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=8a88478f
gentoo/livecd.py: remove useless steps
---
gentoo/livecd.py | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index c9e7402..3135174 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -135,14 +135,14 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
self._gentoo_install.setup_sudo()
self._gentoo_install.setup_audio()
- self._gentoo_install.setup_xorg()
- self._gentoo_install.remove_proprietary_drivers()
+ #self._gentoo_install.setup_xorg()
+ #self._gentoo_install.remove_proprietary_drivers()
# TODO: This needs to be tried and fixed properly on Gentoo once installing X works
- try:
- self._gentoo_install.setup_nvidia_legacy()
- except Exception as e:
- # caused by Entropy bug <0.99.47.2, remove in future
- log.error("Unable to install legacy nvidia drivers: %s" % e)
+ #try:
+ # self._gentoo_install.setup_nvidia_legacy()
+ #except Exception as e:
+ # # caused by Entropy bug <0.99.47.2, remove in future
+ # log.error("Unable to install legacy nvidia drivers: %s" % e)
self._progress.set_fraction(0.95)
self._gentoo_install.configure_services()
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-06 20:46 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-06 20:46 UTC (permalink / raw
To: gentoo-commits
commit: 45b4a0d158fd6afa0b802666e54362df3c53fb6a
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Jul 6 20:45:13 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Jul 6 20:45:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=45b4a0d1
gentoo/livecd.py: removed const_kill_threads (an entropy leftover)
---
gentoo/livecd.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index 3135174..750f8f2 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -174,7 +174,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
self._gentoo_install.destroy()
- const_kill_threads()
+ #const_kill_threads() #entropy leftover
anaconda.intf.setInstallProgressClass(None)
def writeConfiguration(self):
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-07 2:31 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-07 2:31 UTC (permalink / raw
To: gentoo-commits
commit: 6473d6d0c290ecfcd54f72dc7109c11f25e2131b
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 7 02:30:41 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 7 02:30:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=6473d6d0
gentoo/livecd.py: fix cmdline in _get_bootloader_args
---
gentoo/livecd.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index 750f8f2..7a3acff 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -231,6 +231,8 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
def _get_bootloader_args(self):
+ cmdline = open("/proc/cmdline", "r").read().strip().split()
+
# keymaps genkernel vs system map
keymaps_map = {
'azerty': 'azerty',
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-07 14:08 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-07 14:08 UTC (permalink / raw
To: gentoo-commits
commit: 10ad70667182452c05619fd7d8c523f25d4a5dfc
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 7 14:08:23 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 7 14:08:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=10ad7066
We need grub2 to be on the new system
---
gentoo/utils.py | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index e689f68..3f1191b 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -344,7 +344,7 @@ class GentooInstall:
# return 0
def _configure_skel(self):
- pass
+ pass
# copy Sulfur on the desktop
# sulfur_desktop = self._root+"/usr/share/applications/sulfur.desktop"
@@ -980,17 +980,19 @@ class GentooInstall:
os.environ["USE"] = "policykit -gtk -X -gpm"
os.mkdir(self._root+"/etc/portage")
keywordsf = open(self._root+"/etc/portage/package.keywords", "w")
- keywordsf.write("dev-python/rhpl ~amd64\n")
+ keywordsf.write("dev-python/rhpl ~amd64\nsys-boot/grub **")
keywordsf.close()
self.install_package("-1 system-config-date")
- self._progress.set_fraction(0.2)
+ self._progress.set_fraction(0.5)
self.install_package("-1 system-config-keyboard")
- self._progress.set_fraction(0.4)
- self.install_package("-1 system-config-users")
self._progress.set_fraction(0.6)
+ self.install_package("-1 system-config-users")
+ self._progress.set_fraction(0.7)
self.install_package("-1 keyboard-configuration-helpers")
self._progress.set_fraction(0.8)
self.install_package("-1 language-configuration-helpers")
+ self._progress.set_fraction(0.9)
+ self.install_package("-1 =grub-1.99_rc1")
self._progress.set_fraction(1.0)
del os.environ["USE"]
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-07 15:40 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-07 15:40 UTC (permalink / raw
To: gentoo-commits
commit: 0686f39c1df12cfd6c10eb6f9cbac75957698bca
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 7 15:40:17 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 7 15:40:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=0686f39c
gentoo/utils.py: grub +multislot
---
gentoo/utils.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 3f1191b..f77ce39 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -977,7 +977,7 @@ class GentooInstall:
self._progress.set_fraction(0.0)
self._progress.set_text(_("Installing configuration helpers"))
shutil.copy2("/etc/resolv.conf", self._root+"/etc/")
- os.environ["USE"] = "policykit -gtk -X -gpm"
+ os.environ["USE"] = "multislot policykit -gtk -X -gpm"
os.mkdir(self._root+"/etc/portage")
keywordsf = open(self._root+"/etc/portage/package.keywords", "w")
keywordsf.write("dev-python/rhpl ~amd64\nsys-boot/grub **")
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-07 23:57 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-07 23:57 UTC (permalink / raw
To: gentoo-commits
commit: 46fedeaf912808b2485b1bc03e851a3c13ec82ce
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 7 23:56:52 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 7 23:56:52 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=46fedeaf
gentoo/utils.py: some fine-grained progress bar notification
---
gentoo/utils.py | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index f77ce39..2d688de 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -962,14 +962,23 @@ class GentooInstall:
self._progress.set_text(_("Copying the Portage tree (can take a long time)"))
subprocess.call(["cp", "--recursive", "/usr/portage", self._root+"/usr/"])
# We need some packages from anaconda-overlay but ideally they should be added to portage
- self._progress.set_fraction(0.5)
+ self._progress.set_fraction(0.1)
subprocess.call(["cp", "--recursive", "/anaconda-overlay/app-admin", self._root+"/usr/portage/"])
+ self._progress.set_fraction(0.2)
subprocess.call(["cp", "--recursive", "/anaconda-overlay/app-cdr", self._root+"/usr/portage/"])
+ self._progress.set_fraction(0.3)
subprocess.call(["cp", "--recursive", "/anaconda-overlay/app-misc", self._root+"/usr/portage/"])
+ self._progress.set_fraction(0.4)
subprocess.call(["cp", "--recursive", "/anaconda-overlay/dev-python", self._root+"/usr/portage/"])
+ self._progress.set_fraction(0.5)
subprocess.call(["cp", "--recursive", "/anaconda-overlay/dev-util", self._root+"/usr/portage/"])
+ self._progress.set_fraction(0.6)
subprocess.call(["cp", "--recursive", "/anaconda-overlay/sys-apps", self._root+"/usr/portage/"])
+ self._progress.set_fraction(0.7)
subprocess.call(["cp", "--recursive", "/anaconda-overlay/sys-block", self._root+"/usr/portage/"])
+ self._progress.set_fraction(0.8)
+ subprocess.call(["cp", "--recursive", "/anaconda-overlay/sys-boot", self._root+"/usr/portage/"])
+ self._progress.set_fraction(0.9)
subprocess.call(["cp", "--recursive", "/anaconda-overlay/sys-libs", self._root+"/usr/portage/"])
self._progress.set_fraction(1)
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-08 0:49 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-08 0:49 UTC (permalink / raw
To: gentoo-commits
commit: 3a78c051aa10e9a575d4bb9fe4ebc2b47b6b83eb
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 8 00:49:20 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 8 00:49:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=3a78c051
gentoo/utils.py: install a release version of GRUB2
---
gentoo/utils.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 2d688de..07000b8 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1001,7 +1001,7 @@ class GentooInstall:
self._progress.set_fraction(0.8)
self.install_package("-1 language-configuration-helpers")
self._progress.set_fraction(0.9)
- self.install_package("-1 =grub-1.99_rc1")
+ self.install_package("-1 =grub-1.99")
self._progress.set_fraction(1.0)
del os.environ["USE"]
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-08 1:42 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-08 1:42 UTC (permalink / raw
To: gentoo-commits
commit: fd64819c9dc71c201e8031cdf8f097e5d17b9a4f
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 8 01:42:42 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 8 01:42:42 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=fd64819c
gentoo/utils.py: get rid of original grub
---
gentoo/utils.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 07000b8..2fc06f2 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -977,6 +977,7 @@ class GentooInstall:
self._progress.set_fraction(0.7)
subprocess.call(["cp", "--recursive", "/anaconda-overlay/sys-block", self._root+"/usr/portage/"])
self._progress.set_fraction(0.8)
+ subprocess.call(["rm", "-rf", self._root+"/usr/portage/sys-boot/grub"])
subprocess.call(["cp", "--recursive", "/anaconda-overlay/sys-boot", self._root+"/usr/portage/"])
self._progress.set_fraction(0.9)
subprocess.call(["cp", "--recursive", "/anaconda-overlay/sys-libs", self._root+"/usr/portage/"])
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-08 2:35 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-08 2:35 UTC (permalink / raw
To: gentoo-commits
commit: 8f26af1599144acad9200594f7496a91065c5595
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 8 02:35:07 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 8 02:35:07 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=8f26af15
gentoo/utils.py: we don't need truetype in GRUB
---
gentoo/utils.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 2fc06f2..7cc5dba 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -987,7 +987,7 @@ class GentooInstall:
self._progress.set_fraction(0.0)
self._progress.set_text(_("Installing configuration helpers"))
shutil.copy2("/etc/resolv.conf", self._root+"/etc/")
- os.environ["USE"] = "multislot policykit -gtk -X -gpm"
+ os.environ["USE"] = "multislot policykit -gtk -X -gpm -truetype"
os.mkdir(self._root+"/etc/portage")
keywordsf = open(self._root+"/etc/portage/package.keywords", "w")
keywordsf.write("dev-python/rhpl ~amd64\nsys-boot/grub **")
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-08 3:28 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-08 3:28 UTC (permalink / raw
To: gentoo-commits
commit: 5c6db381741796027e8b26e8426c04b6f6b0c758
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 8 03:27:54 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 8 03:27:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=5c6db381
gentoo/utils.py: unmask os-prober
---
gentoo/utils.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 7cc5dba..b2b4403 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -990,7 +990,7 @@ class GentooInstall:
os.environ["USE"] = "multislot policykit -gtk -X -gpm -truetype"
os.mkdir(self._root+"/etc/portage")
keywordsf = open(self._root+"/etc/portage/package.keywords", "w")
- keywordsf.write("dev-python/rhpl ~amd64\nsys-boot/grub **")
+ keywordsf.write("dev-python/rhpl ~amd64 ~x86\nsys-boot/grub **\nsys-boot/os-prober ~amd64 ~x86")
keywordsf.close()
self.install_package("-1 system-config-date")
self._progress.set_fraction(0.5)
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-08 14:48 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-08 14:48 UTC (permalink / raw
To: gentoo-commits
commit: 21c33ba0722312d06a9852f98936c23d42c4483d
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 8 14:48:19 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 8 14:48:19 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=21c33ba0
Install systools
---
gentoo/livecd.py | 18 ++++++++++++------
gentoo/utils.py | 7 +++++++
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index 148967b..7722670 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -121,21 +121,23 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
self._gentoo_install.write_makeconf()
self._gentoo_install.install_setup_tools()
+ action = _("Configuring Gentoo")
+ self._progress.set_label(action)
+ self._progress.set_fraction(0.0)
+
self._gentoo_install.setup_users()
self._gentoo_install.setup_language() # before ldconfig, thx
+ self._progress.set_fraction(0.1)
# if simple networking is enabled, disable NetworkManager
if self.anaconda.instClass.simplenet:
self._gentoo_install.setup_manual_networking()
else:
self._gentoo_install.setup_networkmanager_networking()
self._gentoo_install.setup_keyboard()
-
- action = _("Configuring Gentoo")
- self._progress.set_label(action)
- self._progress.set_fraction(0.9)
-
+ self._progress.set_fraction(0.2)
self._gentoo_install.setup_sudo()
self._gentoo_install.setup_audio()
+ self._progress.set_fraction(0.3)
#self._gentoo_install.setup_xorg()
#self._gentoo_install.remove_proprietary_drivers()
# TODO: This needs to be tried and fixed properly on Gentoo once installing X works
@@ -145,12 +147,14 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
# # caused by Entropy bug <0.99.47.2, remove in future
# log.error("Unable to install legacy nvidia drivers: %s" % e)
- self._progress.set_fraction(0.95)
self._gentoo_install.configure_services()
+ self._progress.set_fraction(0.4)
self._gentoo_install.copy_udev()
self._gentoo_install.env_update()
+ self._progress.set_fraction(0.5)
self._gentoo_install.spawn_chroot("locale-gen", silent = True)
self._gentoo_install.spawn_chroot("ldconfig")
+ self._progress.set_fraction(0.6)
# Fix a possible /tmp problem
self._gentoo_install.spawn("chmod a+w "+self._root+"/tmp")
var_tmp = self._root + "/var/tmp"
@@ -161,6 +165,8 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
with open(var_tmp_keep, "w") as wt:
wt.flush()
+ self._progress.set_fraction(0.7)
+ self._gentoo_install.install_systools()
action = _("Gentoo configuration complete")
self._progress.set_label(action)
self._progress.set_fraction(1.0)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 2c8e171..31850ab 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1045,6 +1045,13 @@ class GentooInstall:
return "\n".join([cflags, cxxflags, chost, makeopts, gentoo_mirrors, sync, use])
+ def install_systools(self):
+ self._progress.set_text(_("Installing system tools"))
+ self.install_package(self._anaconda.cron)
+ self._progress.set_fraction(0.8)
+ self.install_package(self._anaconda.syslog)
+ self._progress.set_fraction(0.9)
+
def _get_langpacks(self):
return None
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-08 15:27 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-08 15:27 UTC (permalink / raw
To: gentoo-commits
commit: 4bad67342432f72be4a9a71e4c94eb4ede85c131
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 8 15:26:45 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 8 15:26:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=4bad6734
gentoo/utils.py: oops, should've spotted that colon
---
gentoo/utils.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 31850ab..ec8a6bc 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1025,7 +1025,7 @@ class GentooInstall:
cxxflags = "CXXFLAGS=\"${CFLAGS}\""
- if arch == "amd64"
+ if arch == "amd64":
arch = "x86_64"
chost = ("CHOST=\"%s-pc-linux-gnu\"", arch)
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-08 15:56 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-08 15:56 UTC (permalink / raw
To: gentoo-commits
commit: 92f2860c04884cdf48117c2b97f7fcc91864ab6d
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 8 15:55:47 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 8 15:55:47 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=92f2860c
gentoo/utils.py: makeconf_factory: FORMAT not TUPLE!
---
gentoo/utils.py | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index ec8a6bc..227a62f 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1018,30 +1018,30 @@ class GentooInstall:
makeconf.write(text)
def makeconf_factory(self, settings, arch):
- cflags = ("-march=%s -O%s", settings.makeconf_march, settings.makeconf_opt)
+ cflags = "-march=%s -O%s" % (settings.makeconf_march, settings.makeconf_opt)
if settings.makeconf_pipe:
cflags += " -pipe"
- cflags = ("CFLAGS=\"%s\"", cflags)
+ cflags = "CFLAGS=\"%s\"" % cflags
cxxflags = "CXXFLAGS=\"${CFLAGS}\""
if arch == "amd64":
arch = "x86_64"
- chost = ("CHOST=\"%s-pc-linux-gnu\"", arch)
+ chost = "CHOST=\"%s-pc-linux-gnu\"" % arch
if settings.makeconf_jobs == 0:
makeopts = "-j"
else:
- makeopts = ("-j%i", settings.makeconf_jobs)
+ makeopts = "-j%i" % settings.makeconf_jobs
if settings.makeconf_load > 0:
- makeopts += (" -l%i", settings.makeconf_jobs)
+ makeopts += " -l%i" % settings.makeconf_jobs
if settings.makeconf_silent:
makeopts += " -s"
- makeopts = ("MAKEOPTS=\"%s\"", makeopts)
+ makeopts = "MAKEOPTS=\"%s\"" % makeopts
- gentoo_mirrors = ("GENTOO_MIRRORS=\"%s\"", " ".join(settings.mirrors))
- sync = ("SYNC=\"%s\"", " ".join(settings.mirrors_sync))
- use = ("USE=\"%s\"", " ".join(settings.use_flags))
+ gentoo_mirrors = "GENTOO_MIRRORS=\"%s\"" % " ".join(settings.mirrors)
+ sync = "SYNC=\"%s\"" % " ".join(settings.mirrors_sync)
+ use = "USE=\"%s\"" % " ".join(settings.use_flags)
return "\n".join([cflags, cxxflags, chost, makeopts, gentoo_mirrors, sync, use])
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-08 17:19 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-08 17:19 UTC (permalink / raw
To: gentoo-commits
commit: fbb472e9a38d5f6490867f4189f3b80613a55e5d
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 8 17:19:21 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 8 17:19:21 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=fbb472e9
gentoo/livecd.py: mirrors are set up with the rest of make.conf
---
gentoo/livecd.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index 7722670..9e1c59a 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -173,7 +173,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
def doPostInstall(self, anaconda):
- self._gentoo_install.setup_portage_mirrors()
+ #self._gentoo_install.setup_portage_mirrors()
self._gentoo_install.language_packs_install()
self._gentoo_install.emit_install_done()
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-08 17:54 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-08 17:54 UTC (permalink / raw
To: gentoo-commits
commit: 74e00a2e84a510e000923d5530b5380d1df13c7d
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 8 17:54:42 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 8 17:54:42 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=74e00a2e
Install the kernel
---
gentoo/livecd.py | 4 +++-
gentoo/utils.py | 23 +++++++++++++++++------
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index 9e1c59a..9a03445 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -121,6 +121,8 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
self._gentoo_install.write_makeconf()
self._gentoo_install.install_setup_tools()
+ self._gentoo_install.install_kernel()
+
action = _("Configuring Gentoo")
self._progress.set_label(action)
self._progress.set_fraction(0.0)
@@ -174,7 +176,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
def doPostInstall(self, anaconda):
#self._gentoo_install.setup_portage_mirrors()
- self._gentoo_install.language_packs_install()
+ #self._gentoo_install.language_packs_install()
self._gentoo_install.emit_install_done()
storage.writeEscrowPackets(anaconda)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 227a62f..96ece10 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -29,6 +29,7 @@ import sys
import stat
import sys
import subprocess
+import commands
import shutil
import statvfs
import tempfile
@@ -993,17 +994,17 @@ class GentooInstall:
keywordsf.write("dev-python/rhpl ~amd64 ~x86\nsys-boot/grub **\nsys-boot/os-prober ~amd64 ~x86")
keywordsf.close()
self.install_package("-1 system-config-date")
- self._progress.set_fraction(0.5)
+ self._progress.set_fraction(0.3)
self.install_package("-1 system-config-keyboard")
- self._progress.set_fraction(0.6)
+ self._progress.set_fraction(0.4)
self.install_package("-1 system-config-users")
- self._progress.set_fraction(0.7)
+ self._progress.set_fraction(0.5)
self.install_package("-1 keyboard-configuration-helpers")
- self._progress.set_fraction(0.8)
+ self._progress.set_fraction(0.6)
self.install_package("-1 language-configuration-helpers")
- self._progress.set_fraction(0.9)
+ self._progress.set_fraction(0.7)
self.install_package("-1 =grub-1.99")
- self._progress.set_fraction(1.0)
+ self._progress.set_fraction(0.8)
del os.environ["USE"]
def set_profile(self):
@@ -1052,6 +1053,16 @@ class GentooInstall:
self.install_package(self._anaconda.syslog)
self._progress.set_fraction(0.9)
+ def install_kernel(self):
+ self._progress.set_text(_("Installing the kernel"))
+ self.install_package("<gentoo-sources-2.6.38") # version on LiveDVD
+ self.spawn_chroot("eselect kernel set 1")
+ self._progress.set_fraction(0.9)
+ commands.getoutput("gunzip -c /proc/config.gz > %s/usr/src/linux/.config" % self._root)
+ self._anaconda._intf.instProgress.terminal.run_command(
+ "chroot %s /bin/bash -c 'cd /usr/src/linux ; make modules_install'" % self._root)
+ self._progress.set_fraction(1.0)
+
def _get_langpacks(self):
return None
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-08 22:07 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-08 22:07 UTC (permalink / raw
To: gentoo-commits
commit: 4eb9ec75138168ab15b7c99b18c9bfb11f62efe3
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 8 22:06:53 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 8 22:06:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=4eb9ec75
gentoo/utils.py: copy kernel and modules from liveDVD
---
gentoo/utils.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 96ece10..67d300f 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1017,6 +1017,7 @@ class GentooInstall:
text = self.makeconf_factory(self._anaconda, os.environ["ANACONDA_PRODUCTARCH"])
makeconf = open(self._root+"/etc/make.conf", "w")
makeconf.write(text)
+ makeconf.close()
def makeconf_factory(self, settings, arch):
cflags = "-march=%s -O%s" % (settings.makeconf_march, settings.makeconf_opt)
@@ -1055,12 +1056,11 @@ class GentooInstall:
def install_kernel(self):
self._progress.set_text(_("Installing the kernel"))
- self.install_package("<gentoo-sources-2.6.38") # version on LiveDVD
- self.spawn_chroot("eselect kernel set 1")
+ # TODO: Proper genkernel build
+ subprocess.call(["mount", "/dev/sr0", "/mnt/cdrom"])
+ subprocess.call(["cp", "-PR", "/mnt/cdrom/boot", self._root])
self._progress.set_fraction(0.9)
- commands.getoutput("gunzip -c /proc/config.gz > %s/usr/src/linux/.config" % self._root)
- self._anaconda._intf.instProgress.terminal.run_command(
- "chroot %s /bin/bash -c 'cd /usr/src/linux ; make modules_install'" % self._root)
+ subprocess.call(["cp", "-PR", "/lib/modules", self._root+"/lib"])
self._progress.set_fraction(1.0)
def _get_langpacks(self):
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-10 3:18 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-10 3:18 UTC (permalink / raw
To: gentoo-commits
commit: ef82e4c5096c79fd2b85920bbbb78189dbc9c367
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 10 03:18:47 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 10 03:18:47 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=ef82e4c5
gentoo/utils.py: install Xorg too
---
gentoo/utils.py | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 542da39..2423b8d 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -603,7 +603,10 @@ class GentooInstall:
#xorg_conf = self._root + live_xorg_conf
#shutil.copy2(live_xorg_conf, xorg_conf)
#shutil.copy2(live_xorg_conf, xorg_conf+".original")
- # Packages should depend on Xorg so it will be pulled automatically
+ if self._anaconda.xorg:
+ self._progress.set_label("Installing Xorg")
+ self.install_package("xorg-server")
+ self._progress.set_fraction(0.35)
if self._anaconda.xorg == "fluxbox":
self.install_package("x11-wm/fluxbox")
if self._anaconda.xorg == "gnome":
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-10 12:13 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-10 12:13 UTC (permalink / raw
To: gentoo-commits
commit: 3a20588f83e42d64f3c15b07a00b944995beefc8
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 10 12:13:37 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 10 12:13:37 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=3a20588f
gentoo/utils.py: try handling some compilation errors
---
gentoo/utils.py | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 2423b8d..4c2333b 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -269,12 +269,13 @@ class GentooInstall:
# del self._settings[sys_settings_plg_id]['misc']['configprotectskip'][:]
def install_package(self, atom, match = None, silent = False, fetch = False):
- return self._portage.install(atom)
-
- def install_masked_package(self, atom):
- os.environ["ACCEPT_KEYWORDS"] = "~amd64 ~x86"
- return self._portage.install(atom)
- del os.environ["ACCEPT_KEYWORDS"]
+ if not self._portage.install(atom):
+ os.environ["MAKEOPTS"] = "-j1"
+ if not self._portage.install(atom):
+ log = open("/root/emerge-fail.log", "a")
+ log.writeln(atom)
+ log.close()
+ del os.environ["MAKEOPTS"]
# TODO: We don't remove anything from stage3
def remove_package(self, atom, match = None, silent = False):
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-10 15:36 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-10 15:36 UTC (permalink / raw
To: gentoo-commits
commit: 5f5510e0ada0e7c273a917df6ed1f99113891bd6
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 10 15:36:36 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 10 15:36:36 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=5f5510e0
gentoo/utils.py: set_text in setup_xorg
---
gentoo/utils.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 4c2333b..d4a3599 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -605,7 +605,7 @@ class GentooInstall:
#shutil.copy2(live_xorg_conf, xorg_conf)
#shutil.copy2(live_xorg_conf, xorg_conf+".original")
if self._anaconda.xorg:
- self._progress.set_label("Installing Xorg")
+ self._progress.set_text(_("Installing Xorg"))
self.install_package("xorg-server")
self._progress.set_fraction(0.35)
if self._anaconda.xorg == "fluxbox":
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-11 17:53 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-11 17:53 UTC (permalink / raw
To: gentoo-commits
commit: 53ef583ff9b90d0813bf847725a0e2dbf65a58ae
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 11 17:53:09 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 11 17:53:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=53ef583f
gentoo/utils.py: copy the kernel where GRUB can find them
---
gentoo/utils.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 3858df1..e0cba33 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1078,7 +1078,8 @@ class GentooInstall:
self._progress.set_text(_("Installing the kernel"))
# TODO: Proper genkernel build
subprocess.call(["mount", "/dev/sr0", "/mnt/cdrom"])
- subprocess.call(["cp", "-PR", "/mnt/cdrom/boot", self._root])
+ shutil.copy2("/mnt/cdrom/boot/gentoo", self._root+"/boot/kernel-gentoo")
+ shutil.copy2("/mnt/cdrom/boot/gentoo.igz", self._root+"/boot/initrd-gentoo")
self._progress.set_fraction(0.9)
subprocess.call(["cp", "-PR", "/lib/modules", self._root+"/lib"])
self._progress.set_fraction(1.0)
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-11 17:53 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-11 17:53 UTC (permalink / raw
To: gentoo-commits
commit: ee4c6de32ad9c53c0d94c1664262a5ebcccef3b1
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 11 17:28:13 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 11 17:28:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=ee4c6de3
gentoo/utils.py: also install xterm if installing Xorg, useful
---
gentoo/utils.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index d4a3599..b32e962 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -607,6 +607,7 @@ class GentooInstall:
if self._anaconda.xorg:
self._progress.set_text(_("Installing Xorg"))
self.install_package("xorg-server")
+ self.install_package("xterm")
self._progress.set_fraction(0.35)
if self._anaconda.xorg == "fluxbox":
self.install_package("x11-wm/fluxbox")
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-11 17:53 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-11 17:53 UTC (permalink / raw
To: gentoo-commits
commit: 3e919e14f9d35b590e4be7aa40a1ecec3d36293c
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 11 17:30:17 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 11 17:30:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=3e919e14
Copy the emerge-fail log
---
gentoo/livecd.py | 2 +-
gentoo/utils.py | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index 1ea10f1..eee802d 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -228,7 +228,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
# copy log files into chroot
isys.sync()
config_files = ["/tmp/anaconda.log", "/tmp/lvmout", "/tmp/resize.out",
- "/tmp/program.log", "/tmp/storage.log"]
+ "/tmp/program.log", "/tmp/storage.log", "/tmp/emerge-fail.log"]
install_dir = self._root + "/var/log/installer"
if not os.path.isdir(install_dir):
os.makedirs(install_dir)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index b32e962..3858df1 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -270,10 +270,13 @@ class GentooInstall:
def install_package(self, atom, match = None, silent = False, fetch = False):
if not self._portage.install(atom):
+ log = open("/tmp/emerge-fail.log", "a")
+ log.writeln(atom+" failed to install, trying again with make -j1")
+ log.close()
os.environ["MAKEOPTS"] = "-j1"
if not self._portage.install(atom):
- log = open("/root/emerge-fail.log", "a")
- log.writeln(atom)
+ log = open("/tmp/emerge-fail.log", "a")
+ log.writeln(atom+" failed to install the second time :(")
log.close()
del os.environ["MAKEOPTS"]
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-12 1:09 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-12 1:09 UTC (permalink / raw
To: gentoo-commits
commit: c659c0377c721d70278cac8545a94e6f408f9fff
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 12 01:08:43 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 12 01:08:43 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=c659c037
gentoo/utils.py: fix broken logger
---
gentoo/utils.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index e0cba33..0652391 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -271,12 +271,12 @@ class GentooInstall:
def install_package(self, atom, match = None, silent = False, fetch = False):
if not self._portage.install(atom):
log = open("/tmp/emerge-fail.log", "a")
- log.writeln(atom+" failed to install, trying again with make -j1")
+ log.write(atom+" failed to install, trying again with make -j1\n")
log.close()
os.environ["MAKEOPTS"] = "-j1"
if not self._portage.install(atom):
log = open("/tmp/emerge-fail.log", "a")
- log.writeln(atom+" failed to install the second time :(")
+ log.writeln(atom+" failed to install the second time :(\n")
log.close()
del os.environ["MAKEOPTS"]
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-12 3:31 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-12 3:31 UTC (permalink / raw
To: gentoo-commits
commit: 8bce43bf7b8099cd595e6681903a70e575d2a346
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul 12 03:31:04 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul 12 03:31:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=8bce43bf
gentoo/utils.py: fixed logger again
---
gentoo/utils.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 0652391..8f04dc1 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -276,7 +276,7 @@ class GentooInstall:
os.environ["MAKEOPTS"] = "-j1"
if not self._portage.install(atom):
log = open("/tmp/emerge-fail.log", "a")
- log.writeln(atom+" failed to install the second time :(\n")
+ log.write(atom+" failed to install the second time :(\n")
log.close()
del os.environ["MAKEOPTS"]
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-21 20:53 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 20:53 UTC (permalink / raw
To: gentoo-commits
commit: d511d5d13cdf9f543421fe2da718027377692939
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 20:53:29 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 20:53:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=d511d5d1
gentoo/utils.py: removed some cruft
---
gentoo/utils.py | 98 -------------------------------------------------------
1 files changed, 0 insertions(+), 98 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 8f04dc1..7548d51 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -749,11 +749,6 @@ class GentooInstall:
def env_update(self):
self.spawn_chroot("env-update &> /dev/null")
- #def _get_entropy_webservice(self):
- # factory = self._entropy.WebServices()
- # webserv = factory.new(REPO_NAME)
- # return webserv
-
def emit_install_done(self):
# user installed Gentoo, w00hooh!
pass
@@ -763,9 +758,6 @@ class GentooInstall:
This function copies the stage3 into self._root
"""
- # We don't remove stuff from the stage3
- #if not os.getenv("GENTOO_DISABLE_PKG_REMOVAL"):
- # self._setup_packages_to_remove()
action = _("System Installation")
copy_update_interval = 10
@@ -858,14 +850,6 @@ class GentooInstall:
if currentfile.startswith("/dev/"):
continue
- #try:
- # if file is in the ignore list
- # if self._files_db.isFileAvailable(
- # currentfile.decode('raw_unicode_escape')):
- # continue
- #except:
- # import traceback
- # traceback.print_exc()
tofile = self._root + currentfile
st_info = os.lstat(fromfile)
@@ -886,88 +870,6 @@ class GentooInstall:
self._progress.set_fraction(1)
- #self._change_entropy_chroot(self._root)
- # doing here, because client_repo should point to self._root chroot
- #client_repo = self._entropy.installed_repository()
- # NOT Removing Unwanted Packages
- #if self._package_identifiers_to_remove:
-
- # this makes packages removal much faster
- # client_repo.createAllIndexes()
-
- # total_counter = len(self._package_identifiers_to_remove)
- # current_counter = 0
- # self._progress.set_fraction(current_counter)
- # self._progress.set_text(_("Cleaning packages"))
- # self._entropy.oldcount = [0,total_counter]
-
- # for pkg_id in self._package_identifiers_to_remove:
- # current_counter += 1
- # atom = client_repo.retrieveAtom(pkg_id)
- # if not atom:
- # continue
-
- ### XXX needed to speed up removal process
- #"""
- # category = client_repo.retrieveCategory(pkg_id)
- # version = client_repo.retrieveVersion(pkg_id)
- # name = client_repo.retrieveName(pkg_id)
- # ebuild_path = self._root+"/var/db/pkg/%s/%s-%s" % (
- # category, name, version)
- # if os.path.isdir(ebuild_path):
- # shutil.rmtree(ebuild_path, True)
- #"""
- ### XXX
-
- # self.remove_package(None, match = (pkg_id,0), silent = True)
- # frac = float(current_counter)/total_counter
- # self._progress.set_fraction(frac)
- # self._progress.set_text("%s: %s" % (
- # _("Cleaning package"), atom,))
- # self._entropy.oldcount = [current_counter, total_counter]
-
- #while 1:
- # change = False
- # mydirs = set()
- #try:
- # mydirs = self._files_db.retrieveContent(None, contentType = "dir")
- #except TypeError:
- # mydirs = set([x for x, y in self._files_db.retrieveContent(None,
- # extended = True) if y == "dir"])
- #for mydir in mydirs:
- # mytree = os.path.join(self._root,mydir)
- # if os.path.isdir(mytree) and not client_repo.isFileAvailable(
- # mydir):
- # try:
- # os.rmdir(mytree)
- # change = True
- # except OSError:
- # pass
- #if not change:
- # break
-
- # We don't do that on Gentoo
- # list installed packages and setup a package set
- #inst_packages = ['%s:%s\n' % (entropy.dep.dep_getkey(atom),slot,) \
- # for idpk, atom, slot, revision in client_repo.listAllPackages(
- # get_scope = True, order_by = "atom")]
- # perfectly fine w/o self._root
- #pkgset_dir = etpConst['confsetsdir']
- #if not os.path.isdir(pkgset_dir):
- # os.makedirs(pkgset_dir, 0755)
- #set_name = "install_base"
- #set_filepath = os.path.join(pkgset_dir, set_name)
- #try:
- # f = open(set_filepath,"w")
- # f.writelines(inst_packages)
- # f.flush()
- # f.close()
- #except (IOError,):
- # pass
-
- #self._change_entropy_chroot()
-
- self._progress.set_fraction(1)
self._progress.set_text(_("Installation complete"))
def language_packs_install(self):
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-21 21:14 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 21:14 UTC (permalink / raw
To: gentoo-commits
commit: ec00840494484c246b43c423bc1bbb73e0c0febd
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 21:13:40 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 21:13:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=ec008404
gentoo/utils.py: break the copying out of live_install for other funcs
---
gentoo/utils.py | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 7548d51..dcf186a 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -752,25 +752,18 @@ class GentooInstall:
def emit_install_done(self):
# user installed Gentoo, w00hooh!
pass
-
- def live_install(self):
- """
- This function copies the stage3 into self._root
- """
-
-
- action = _("System Installation")
+
+ def copy_files(self, path_from, path_to):
copy_update_interval = 10
copy_update_counter = 9
# get file counters
total_files = 0
- image_dir = self._prod_root
+ image_dir = path_to
for z,z,files in os.walk(image_dir):
for file in files:
total_files += 1
self._progress.set_fraction(0.0)
- self._progress.set_text(action)
def copy_other(fromfile, tofile):
proc = subprocess.Popen(("/bin/cp", "-a", fromfile, tofile),
@@ -799,7 +792,7 @@ class GentooInstall:
os.symlink(source_link, tofile)
current_counter = 0
- currentfile = "/"
+ currentfile = path_from
image_dir_len = len(image_dir)
# Create the directory structure
# self.InstallFilesToIgnore
@@ -870,7 +863,17 @@ class GentooInstall:
self._progress.set_fraction(1)
+ def live_install(self):
+ """
+ This function copies the stage3 into self._root
+ """
+
+ action = _("Installing stage3")
+
+ copy_files(self._prod_root, "/")
+
self._progress.set_text(_("Installation complete"))
+
def language_packs_install(self):
return
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-21 22:02 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 22:02 UTC (permalink / raw
To: gentoo-commits
commit: 0187b3b275e6d5237088840235fe093a16e4af04
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 22:02:26 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 22:02:26 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=0187b3b2
gentoo/utils.py: copy_files is not global
---
gentoo/utils.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index dcf186a..42f745e 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -870,7 +870,7 @@ class GentooInstall:
action = _("Installing stage3")
- copy_files(self._prod_root, "/")
+ self.copy_files(self._prod_root, "/")
self._progress.set_text(_("Installation complete"))
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-07-21 22:18 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-07-21 22:18 UTC (permalink / raw
To: gentoo-commits
commit: e197c645c70efcd0e6d0beb9d1e2df52aa60a08d
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 22:17:54 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 22:17:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=e197c645
gentoo/utils.py: revert d511d5d13cdf9f543421fe2da718027377692939
---
gentoo/utils.py | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 42f745e..7548d51 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -752,18 +752,25 @@ class GentooInstall:
def emit_install_done(self):
# user installed Gentoo, w00hooh!
pass
-
- def copy_files(self, path_from, path_to):
+
+ def live_install(self):
+ """
+ This function copies the stage3 into self._root
+ """
+
+
+ action = _("System Installation")
copy_update_interval = 10
copy_update_counter = 9
# get file counters
total_files = 0
- image_dir = path_to
+ image_dir = self._prod_root
for z,z,files in os.walk(image_dir):
for file in files:
total_files += 1
self._progress.set_fraction(0.0)
+ self._progress.set_text(action)
def copy_other(fromfile, tofile):
proc = subprocess.Popen(("/bin/cp", "-a", fromfile, tofile),
@@ -792,7 +799,7 @@ class GentooInstall:
os.symlink(source_link, tofile)
current_counter = 0
- currentfile = path_from
+ currentfile = "/"
image_dir_len = len(image_dir)
# Create the directory structure
# self.InstallFilesToIgnore
@@ -863,17 +870,7 @@ class GentooInstall:
self._progress.set_fraction(1)
- def live_install(self):
- """
- This function copies the stage3 into self._root
- """
-
- action = _("Installing stage3")
-
- self.copy_files(self._prod_root, "/")
-
self._progress.set_text(_("Installation complete"))
-
def language_packs_install(self):
return
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-08-11 12:58 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-08-11 12:58 UTC (permalink / raw
To: gentoo-commits
commit: 17fe1477e919c91e45476f712680ef107a57e0ec
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Aug 11 12:58:20 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Aug 11 12:58:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=17fe1477
Sync Portage and install from a stage3 tarball
---
gentoo/utils.py | 133 +++++++-----------------------------------------------
1 files changed, 18 insertions(+), 115 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 45a3888..017c8d4 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -760,113 +760,7 @@ class GentooInstall:
action = _("System Installation")
- copy_update_interval = 10
- copy_update_counter = 9
- # get file counters
- total_files = 0
- image_dir = self._prod_root
- for z,z,files in os.walk(image_dir):
- for file in files:
- total_files += 1
-
- self._progress.set_fraction(0.0)
- self._progress.set_text(action)
-
- def copy_other(fromfile, tofile):
- proc = subprocess.Popen(("/bin/cp", "-a", fromfile, tofile),
- stdout = subprocess.PIPE, stderr = subprocess.PIPE)
- proc.wait()
- del proc
-
- def copy_reg(fromfile, tofile):
- try:
- shutil.copy2(fromfile, tofile)
- user = os.stat(fromfile)[4]
- group = os.stat(fromfile)[5]
- os.chown(tofile, user, group)
- shutil.copystat(fromfile, tofile)
- except IOError, e:
- if (e[0] == 40) or (e[0] == 2):
- # workaround for Too many levels of symbolic links
- copy_other(fromfile, tofile)
- else:
- raise
-
- def copy_lnk(fromfile, tofile):
- source_link = os.readlink(fromfile)
- if os.path.lexists(tofile):
- os.remove(tofile)
- os.symlink(source_link, tofile)
-
- current_counter = 0
- currentfile = "/"
- image_dir_len = len(image_dir)
- # Create the directory structure
- # self.InstallFilesToIgnore
- for currentdir, subdirs, files in os.walk(image_dir):
-
- copy_update_counter += 1
-
- for xdir in subdirs:
-
- image_path_dir = currentdir + "/" + xdir
- mydir = image_path_dir[image_dir_len:]
- rootdir = self._root + mydir
-
- # handle broken symlinks
- if os.path.islink(rootdir) and not os.path.exists(rootdir):
- # broken symlink
- os.remove(rootdir)
-
- # if our directory is a file on the live system
- elif os.path.isfile(rootdir): # really weird...!
- os.remove(rootdir)
-
- # if our directory is a symlink instead, then copy the symlink
- if os.path.islink(image_path_dir) and not os.path.isdir(rootdir):
- # for security we skip live items that are dirs
- tolink = os.readlink(image_path_dir)
- if os.path.islink(rootdir):
- os.remove(rootdir)
- os.symlink(tolink,rootdir)
- elif (not os.path.isdir(rootdir)) and \
- (not os.access(rootdir,os.R_OK)):
- os.makedirs(rootdir)
-
- if not os.path.islink(rootdir):
- # symlink don't need permissions, also until os.walk
- # ends they might be broken
- user = os.stat(image_path_dir)[4]
- group = os.stat(image_path_dir)[5]
- os.chown(rootdir,user,group)
- shutil.copystat(image_path_dir,rootdir)
-
- for path_file in sorted(files):
-
- current_counter += 1
- fromfile = currentdir + "/" + path_file
- currentfile = fromfile[image_dir_len:]
-
- if currentfile.startswith("/dev/"):
- continue
-
-
- tofile = self._root + currentfile
- st_info = os.lstat(fromfile)
- if stat.S_ISREG(st_info[stat.ST_MODE]):
- copy_reg(fromfile, tofile)
- elif stat.S_ISLNK(st_info[stat.ST_MODE]):
- copy_lnk(fromfile, tofile)
- else:
- copy_other(fromfile, tofile)
-
-
- if (copy_update_counter == copy_update_interval) or \
- ((total_files - 1000) < current_counter):
- # do that every 1000 iterations
- copy_update_counter = 0
- frac = float(current_counter)/total_files
- self._progress.set_fraction(frac)
+ anaconda._intf.instProgress.terminal.run_command("tar xvjpf /tmp/stage3.tar.bz2 -C "+self._root)
self._progress.set_fraction(1)
@@ -882,8 +776,8 @@ class GentooInstall:
def copy_portage(self):
self._progress.set_fraction(0.0)
- self._progress.set_text(_("Copying the Portage tree (can take a long time)"))
- subprocess.call(["cp", "--recursive", "/usr/portage", self._root+"/usr/"])
+ self._progress.set_text(_("Syncing the Portage tree (can take a long time)"))
+ self.portage.sync()
# We need some packages from anaconda-overlay but ideally they should be added to portage
self._progress.set_fraction(0.1)
subprocess.call(["cp", "--recursive", "/anaconda-overlay/app-admin", self._root+"/usr/portage/"])
@@ -969,12 +863,21 @@ class GentooInstall:
def install_kernel(self):
self._progress.set_text(_("Installing the kernel"))
- # TODO: Proper genkernel build
- subprocess.call(["mount", "/dev/sr0", "/mnt/cdrom"])
- shutil.copy2("/mnt/cdrom/boot/gentoo", self._root+"/boot/kernel-gentoo")
- shutil.copy2("/mnt/cdrom/boot/gentoo.igz", self._root+"/boot/initrd-gentoo")
- self._progress.set_fraction(0.9)
- subprocess.call(["cp", "-PR", "/lib/modules", self._root+"/lib"])
+ if self.anaconda.genkernel:
+ subprocess.call(["mount", "/dev/sr0", "/mnt/cdrom"])
+ shutil.copy2("/mnt/cdrom/boot/gentoo", self._root+"/boot/kernel-gentoo")
+ shutil.copy2("/mnt/cdrom/boot/gentoo.igz", self._root+"/boot/initrd-gentoo")
+ self._progress.set_fraction(0.9)
+ subprocess.call(["cp", "-PR", "/lib/modules", self._root+"/lib"])
+ else:
+ shutil.copy2("/usr/src/linux-"+self.anaconda.kernel, self._root+"/usr/src/")
+ self._progress.set_fraction(0.5)
+ self._progress.set_text(_("Compiling your custom kernel"))
+ anaconda._intf.instProgress.terminal.run_command("chroot "+self._root+" eselect kernel set 1")
+ anaconda._intf.instProgress.terminal.run_command("cd "+self._root+"/usr/src/linux")
+ anaconda._intf.instProgress.terminal.run_command("make && make modules && make modules_install")
+ shutil.copy2(self+.root+"/usr/src/linux/arch/x86/boot/bzImage", self._root+"/boot/kernel-gentoo")
+
self._progress.set_fraction(1.0)
def _get_langpacks(self):
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-08-17 0:25 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-08-17 0:25 UTC (permalink / raw
To: gentoo-commits
commit: 0312ad3461b42e8f3e673c4c6fee171e55176ad9
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Aug 17 00:24:06 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Aug 17 00:25:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=0312ad34
Proper stage3 fetching
---
gentoo/utils.py | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 808202b..507ac82 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -757,8 +757,27 @@ class GentooInstall:
"""
This function copies the stage3 into self._root
"""
-
-
+ action = _("Downloading stage3...")
+
+ if os.environ["ANACONDA_PRODUCTARCH"] == "x86":
+ arch = "x86"
+ cpu = "i686"
+ if os.environ["ANACONDA_PRODUCTARCH"] == "amd64":
+ arch = "amd64"
+ cpu = "amd64"
+
+ latest_stage = "http://distfiles.gentoo.org/releases/%s/autobuilds/latest-stage3-%s.txt" % (arch, cpu)
+
+ os.system("wget -nc -O /tmp/latest-stage %s " % latest_stage)
+ f = open("/tmp/latest-stage")
+
+ lines = f.read().split("\n")
+ stage = lines[2]
+
+ stageurl = "http://distfiles.gentoo.org/releases/%s/autobuilds/%s" % (arch, stage)
+
+ os.system("wget -nc -O "+productPath+" %s " % stageurl)
+
action = _("Unpacking stage3")
anaconda._intf.instProgress.terminal.run_command("tar xvjpf "+productPath+" -C "+self._root)
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-08-21 0:03 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-08-21 0:03 UTC (permalink / raw
To: gentoo-commits
commit: 47115c4e7471c2591ef60fa712c0e924b66bbdef
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Aug 20 18:28:24 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Aug 20 18:28:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=47115c4e
utils.py: fix stage3 unpack and portage sync
---
gentoo/utils.py | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index d634443..49d6ee2 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -781,6 +781,9 @@ class GentooInstall:
action = _("Unpacking stage3")
self._anaconda._intf.instProgress.terminal.run_command("tar xvjpf "+productPath+" -C "+self._root)
+ os.system("mount -t proc none %s/proc" % self._root)
+
+
self._progress.set_fraction(1)
self._progress.set_text(_("Unpacking stage3 complete"))
@@ -796,7 +799,7 @@ class GentooInstall:
def copy_portage(self):
self._progress.set_fraction(0.0)
self._progress.set_text(_("Syncing the Portage tree (can take a long time)"))
- self.portage.sync()
+ self._portage.sync()
# We need some packages from anaconda-overlay but ideally they should be added to portage
self._progress.set_fraction(0.1)
subprocess.call(["cp", "--recursive", "/anaconda-overlay/app-admin", self._root+"/usr/portage/"])
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-08-21 0:03 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-08-21 0:03 UTC (permalink / raw
To: gentoo-commits
commit: 0116e96540e524d931b181d633ec6d3f621f3ea4
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Aug 20 17:43:54 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Aug 20 17:43:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=0116e965
livecd.py, utils.py: stage3 fixes
---
gentoo/livecd.py | 4 ++--
gentoo/utils.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index eee802d..d506a5b 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -70,8 +70,8 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
# _getLiveSize() needs to be adjusted but more measurements are needed
def _getLiveSize(self):
- st = os.statvfs(PRODUCT_PATH)
- compressed_byte_size = st.f_blocks * st.f_bsize
+ #st = os.statvfs(PRODUCT_PATH)
+ compressed_byte_size = 150000000 #st.f_blocks * st.f_bsize
return compressed_byte_size * 3 # 3 times is enough
def _getLiveSizeMB(self):
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 276d536..d634443 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -776,10 +776,10 @@ class GentooInstall:
stageurl = "http://distfiles.gentoo.org/releases/%s/autobuilds/%s" % (arch, stage)
- anaconda._intf.instProgress.terminal.run_command("wget -nc -O "+productPath+" %s " % stageurl)
+ self._anaconda._intf.instProgress.terminal.run_command("wget -nc -O "+productPath+" %s " % stageurl)
action = _("Unpacking stage3")
- anaconda._intf.instProgress.terminal.run_command("tar xvjpf "+productPath+" -C "+self._root)
+ self._anaconda._intf.instProgress.terminal.run_command("tar xvjpf "+productPath+" -C "+self._root)
self._progress.set_fraction(1)
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-08-21 0:03 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-08-21 0:03 UTC (permalink / raw
To: gentoo-commits
commit: e033c81cdb58b23208289631f5b27df89ce64a69
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Aug 21 00:03:11 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Aug 21 00:03:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=e033c81c
gentoo/__init__.py: fall back to webrsync
---
gentoo/__init__.py | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/gentoo/__init__.py b/gentoo/__init__.py
index e01844b..a0cbeec 100644
--- a/gentoo/__init__.py
+++ b/gentoo/__init__.py
@@ -33,7 +33,9 @@ class Portage:
def sync(self):
self.term.run_command("chroot "+self.root+" emerge --sync")
if self.term.get_child_exit_status() != 0:
- return False
+ self.term.run_command("chroot "+self.root+" emerge-webrsync")
+ if self.term.get_child_exit_status() != 0:
+ return False
self.term.run_command("chroot "+self.root+" emerge --update portage")
if self.term.get_child_exit_status() == 0:
return True
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-08-21 0:34 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-08-21 0:34 UTC (permalink / raw
To: gentoo-commits
commit: 4fe8eea2db12021718326b3f1e1113a3ae99031c
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Aug 21 00:33:58 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Aug 21 00:33:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=4fe8eea2
utils.py: added a bunch of selfs, copy /etc/resolv.conf
---
gentoo/utils.py | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 49d6ee2..37660ce 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -781,8 +781,8 @@ class GentooInstall:
action = _("Unpacking stage3")
self._anaconda._intf.instProgress.terminal.run_command("tar xvjpf "+productPath+" -C "+self._root)
- os.system("mount -t proc none %s/proc" % self._root)
-
+ os.system("mount -t proc none %s/proc" % self._root)
+ shutil.copy2("/etc/resolv.conf", self._root+"/etc/")
self._progress.set_fraction(1)
@@ -825,7 +825,6 @@ class GentooInstall:
def install_setup_tools(self):
self._progress.set_fraction(0.0)
self._progress.set_text(_("Installing configuration helpers"))
- shutil.copy2("/etc/resolv.conf", self._root+"/etc/")
os.environ["USE"] = "multislot policykit -gtk -X -gpm -truetype"
os.mkdir(self._root+"/etc/portage")
keywordsf = open(self._root+"/etc/portage/package.keywords", "w")
@@ -885,7 +884,7 @@ class GentooInstall:
def install_kernel(self):
self._progress.set_text(_("Installing the kernel"))
- if self.anaconda.genkernel:
+ if self._anaconda.genkernel:
subprocess.call(["mount", "/dev/sr0", "/mnt/cdrom"])
shutil.copy2("/mnt/cdrom/boot/gentoo", self._root+"/boot/kernel-gentoo")
shutil.copy2("/mnt/cdrom/boot/gentoo.igz", self._root+"/boot/initrd-gentoo")
@@ -895,9 +894,9 @@ class GentooInstall:
shutil.copy2("/usr/src/linux-"+self.anaconda.kernel, self._root+"/usr/src/")
self._progress.set_fraction(0.5)
self._progress.set_text(_("Compiling your custom kernel"))
- anaconda._intf.instProgress.terminal.run_command("chroot "+self._root+" eselect kernel set 1")
- anaconda._intf.instProgress.terminal.run_command("cd "+self._root+"/usr/src/linux")
- anaconda._intf.instProgress.terminal.run_command("make && make modules && make modules_install")
+ self._anaconda._intf.instProgress.terminal.run_command("chroot "+self._root+" eselect kernel set 1")
+ self._anaconda._intf.instProgress.terminal.run_command("cd "+self._root+"/usr/src/linux")
+ self._anaconda._intf.instProgress.terminal.run_command("make && make modules && make modules_install")
shutil.copy2(self._root+"/usr/src/linux/arch/x86/boot/bzImage", self._root+"/boot/kernel-gentoo")
self._progress.set_fraction(1.0)
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-08-21 1:13 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-08-21 1:13 UTC (permalink / raw
To: gentoo-commits
commit: 1a05381366dc6fdaec0a6ae394bbf63766dbdfc9
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Aug 21 01:13:02 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Aug 21 01:13:02 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=1a053813
gentoo/utils.py: install *-configuration-tools on new system
---
gentoo/utils.py | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index 7c57f64..e7a1f98 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -832,7 +832,11 @@ class GentooInstall:
keywordsf.close()
self._progress.set_fraction(0.3)
self.install_package("-1 =grub-1.99")
+ self._progress.set_fraction(0.7)
+ self.install_package("-1 keyboard-configuration-helpers")
self._progress.set_fraction(0.8)
+ self.install_package("-1 language-configuration-helpers")
+ self._progress.set_fraction(0.9)
del os.environ["USE"]
def set_profile(self):
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-08-21 1:20 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-08-21 1:20 UTC (permalink / raw
To: gentoo-commits
commit: eb0cf09355a308c68c8199eb5ab8d7c9a33bbfda
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Aug 21 01:20:29 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Aug 21 01:20:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=eb0cf093
gentoo/__init__.py: try webrsync harder
---
gentoo/__init__.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/__init__.py b/gentoo/__init__.py
index a0cbeec..603aa82 100644
--- a/gentoo/__init__.py
+++ b/gentoo/__init__.py
@@ -32,7 +32,7 @@ class Portage:
# Syncs the Portage tree and updates Portage if an update is available
def sync(self):
self.term.run_command("chroot "+self.root+" emerge --sync")
- if self.term.get_child_exit_status() != 0:
+ if not os.path_exists(self.root+"/usr/portage/metadata/timestamp"):
self.term.run_command("chroot "+self.root+" emerge-webrsync")
if self.term.get_child_exit_status() != 0:
return False
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-08-21 1:30 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-08-21 1:30 UTC (permalink / raw
To: gentoo-commits
commit: 66b0be2bc30fa2adf9cea4e2e01b4ed95b215dd1
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Aug 21 01:30:40 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Aug 21 01:30:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=66b0be2b
gentoo/__init__.py: os.path_exists -> os.path.exists
---
gentoo/__init__.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gentoo/__init__.py b/gentoo/__init__.py
index 603aa82..a82125e 100644
--- a/gentoo/__init__.py
+++ b/gentoo/__init__.py
@@ -32,7 +32,7 @@ class Portage:
# Syncs the Portage tree and updates Portage if an update is available
def sync(self):
self.term.run_command("chroot "+self.root+" emerge --sync")
- if not os.path_exists(self.root+"/usr/portage/metadata/timestamp"):
+ if not os.path.exists(self.root+"/usr/portage/metadata/timestamp"):
self.term.run_command("chroot "+self.root+" emerge-webrsync")
if self.term.get_child_exit_status() != 0:
return False
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-08-22 4:28 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-08-22 4:28 UTC (permalink / raw
To: gentoo-commits
commit: 774577b93996bcca372bad67e662c4ac6e0571c3
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Aug 22 04:22:11 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Aug 22 04:22:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=774577b9
Add -fomit-frame-pointer to makeconf_factory
---
gentoo/utils.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index a32ccfa..bdf05f7 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -857,6 +857,8 @@ class GentooInstall:
cflags = "-march=%s -O%s" % (settings.makeconf_march, settings.makeconf_opt)
if settings.makeconf_pipe:
cflags += " -pipe"
+ if settings.fomit:
+ cflags += " -fomit-frame-pointer"
cflags = "CFLAGS=\"%s\"" % cflags
cxxflags = "CXXFLAGS=\"${CFLAGS}\""
^ permalink raw reply related [flat|nested] 75+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: gentoo/
@ 2011-08-22 4:28 Wiktor W Brodlo
0 siblings, 0 replies; 75+ messages in thread
From: Wiktor W Brodlo @ 2011-08-22 4:28 UTC (permalink / raw
To: gentoo-commits
commit: 11b95125d745acf8c44a10605b13b6fbf991aa5c
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Aug 21 16:51:06 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Aug 21 16:51:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=11b95125
gentoo/utils.py: install libuser
---
gentoo/utils.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index e7a1f98..a32ccfa 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -832,6 +832,8 @@ class GentooInstall:
keywordsf.close()
self._progress.set_fraction(0.3)
self.install_package("-1 =grub-1.99")
+ self._progress.set_fraction(0.6)
+ self.install_package("-1 libuser")
self._progress.set_fraction(0.7)
self.install_package("-1 keyboard-configuration-helpers")
self._progress.set_fraction(0.8)
^ permalink raw reply related [flat|nested] 75+ messages in thread
end of thread, other threads:[~2011-08-22 4:29 UTC | newest]
Thread overview: 75+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-22 4:28 [gentoo-commits] proj/anaconda:master commit in: gentoo/ Wiktor W Brodlo
-- strict thread matches above, loose matches on Subject: below --
2011-08-22 4:28 Wiktor W Brodlo
2011-08-21 1:30 Wiktor W Brodlo
2011-08-21 1:20 Wiktor W Brodlo
2011-08-21 1:13 Wiktor W Brodlo
2011-08-21 0:34 Wiktor W Brodlo
2011-08-21 0:03 Wiktor W Brodlo
2011-08-21 0:03 Wiktor W Brodlo
2011-08-21 0:03 Wiktor W Brodlo
2011-08-17 0:25 Wiktor W Brodlo
2011-08-11 12:58 Wiktor W Brodlo
2011-07-21 22:18 Wiktor W Brodlo
2011-07-21 22:02 Wiktor W Brodlo
2011-07-21 21:14 Wiktor W Brodlo
2011-07-21 20:53 Wiktor W Brodlo
2011-07-12 3:31 Wiktor W Brodlo
2011-07-12 1:09 Wiktor W Brodlo
2011-07-11 17:53 Wiktor W Brodlo
2011-07-11 17:53 Wiktor W Brodlo
2011-07-11 17:53 Wiktor W Brodlo
2011-07-10 15:36 Wiktor W Brodlo
2011-07-10 12:13 Wiktor W Brodlo
2011-07-10 3:18 Wiktor W Brodlo
2011-07-08 22:07 Wiktor W Brodlo
2011-07-08 17:54 Wiktor W Brodlo
2011-07-08 17:19 Wiktor W Brodlo
2011-07-08 15:56 Wiktor W Brodlo
2011-07-08 15:27 Wiktor W Brodlo
2011-07-08 14:48 Wiktor W Brodlo
2011-07-08 3:28 Wiktor W Brodlo
2011-07-08 2:35 Wiktor W Brodlo
2011-07-08 1:42 Wiktor W Brodlo
2011-07-08 0:49 Wiktor W Brodlo
2011-07-07 23:57 Wiktor W Brodlo
2011-07-07 15:40 Wiktor W Brodlo
2011-07-07 14:08 Wiktor W Brodlo
2011-07-07 2:31 Wiktor W Brodlo
2011-07-06 20:46 Wiktor W Brodlo
2011-07-06 18:20 Wiktor W Brodlo
2011-07-06 16:42 Wiktor W Brodlo
2011-07-06 14:31 Wiktor W Brodlo
2011-07-06 11:51 Wiktor W Brodlo
2011-07-06 11:19 Wiktor W Brodlo
2011-07-05 20:45 Wiktor W Brodlo
2011-07-05 18:48 Wiktor W Brodlo
2011-07-05 16:09 Wiktor W Brodlo
2011-07-05 15:38 Wiktor W Brodlo
2011-07-05 14:31 Wiktor W Brodlo
2011-07-05 14:07 Wiktor W Brodlo
2011-07-05 13:55 Wiktor W Brodlo
2011-07-05 13:29 Wiktor W Brodlo
2011-07-05 13:22 Wiktor W Brodlo
2011-07-05 13:20 Wiktor W Brodlo
2011-07-05 12:53 Wiktor W Brodlo
2011-07-04 22:47 Wiktor W Brodlo
2011-07-04 22:34 Wiktor W Brodlo
2011-07-04 22:24 Wiktor W Brodlo
2011-07-04 21:19 Wiktor W Brodlo
2011-07-04 21:02 Wiktor W Brodlo
2011-07-04 20:56 Wiktor W Brodlo
2011-07-04 20:52 Wiktor W Brodlo
2011-07-04 16:59 Wiktor W Brodlo
2011-06-27 19:20 Wiktor W Brodlo
2011-06-27 18:27 Wiktor W Brodlo
2011-06-27 13:49 Wiktor W Brodlo
2011-06-27 0:20 Wiktor W Brodlo
2011-06-27 0:05 Wiktor W Brodlo
2011-06-27 0:03 Wiktor W Brodlo
2011-06-26 23:40 Wiktor W Brodlo
2011-06-26 23:28 Wiktor W Brodlo
2011-06-26 21:08 Wiktor W Brodlo
2011-06-26 21:03 Wiktor W Brodlo
2011-06-26 21:03 Wiktor W Brodlo
2011-06-26 19:05 Wiktor W Brodlo
2011-06-25 1:42 Wiktor W Brodlo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox