[gentoo-commits] proj/anaconda:master commit in: /

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     ca4bdab20118cf89838b186ab254cddc3a3cc876
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jun 20 21:21:30 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jun 20 21:21:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=ca4bdab2

fcoe_edd.sh from open-fcoe until it works on Gentoo

---
 fcoe_edd.sh |  235 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 235 insertions(+), 0 deletions(-)

diff --git a/fcoe_edd.sh b/fcoe_edd.sh
new file mode 100755
index 0000000..b571138
--- /dev/null
+++ b/fcoe_edd.sh
@@ -0,0 +1,235 @@
+#!/bin/bash
+
+# Script to read EDD information from sysfs and
+# echo the FCoE interface name and target info.
+# This is a work in progress and will be enhanced
+# with more options as we progress further.
+#
+# Author: Supreeth Venkataraman
+#	  Yi Zou
+#         Intel Corporation
+#
+# Usage: fcoe_edd.sh -t for getting FCoE boot target information.
+#        fcoe_edd.sh -i for getting FCoE boot NIC name.
+#        fcoe_edd.sh -m for getting FCoE boot NIC MAC.
+#        fcoe_edd.sh -e for getting FCoE boot EDD information.
+#        fcoe_edd.sh -r for getting FCoE boot EDD interface type and path.
+#        fcoe_edd.sh -a for getting all FCoE boot information.
+#        fcoe_edd.sh -h for usage information.
+#        Optional: use -v to turn on verbose mode.
+#
+# Notes:
+# FCoE Boot Disk is identified by the following format of boot information
+# in its corresponding sysfs firmware edd entry, i.e.,
+# 	/sys/firmware/edd/int13_dev??/interface
+# which is formatted as (for FCoE):
+# string format: FIBRE wwid: 8c1342b8a0001620 lun: 7f00
+# Please ref. to T13 BIOS Enhanced Disk Drive Specification v3.0 for more
+# defails on EDD.
+#
+
+SYSEDD=/sys/firmware/edd
+PREFIX="FIBRE"
+VERBOSE=
+FCOE_INF=
+FCOE_WWN=
+FCOE_LUN=
+FCOE_EDD=
+FCOE_NIC=
+FCOE_MAC=
+
+
+#
+#
+#
+LOG() {
+	if [ -n "$1" ] && [ -n "${VERBOSE}" ]; then
+		echo "LOG:$1"
+	fi
+}
+
+
+find_fcoe_boot_disk() {
+	local prefix=
+
+	if [ ! -e $SYSEDD ]; then
+		LOG "Need kernel EDD support!"
+		return 1
+	fi
+#	for disk in `find ${SYSEDD} -maxdepth 1 -name 'int13*'`
+	for disk in ${SYSEDD}/int13_*
+	do
+		LOG " checking $disk..."
+		if [ ! -e ${disk}/interface ]; then
+			continue;
+		fi
+		LOG " checking ${disk}/interface..."
+		prefix=`awk '{printf $1}' < ${disk}/interface`
+		if [ "${PREFIX}" != "${prefix}" ]; then
+			LOG " The FCoE Boot prefix ${prefix} is invalid!"
+			continue;
+		fi
+		FCOE_INF=`cat ${disk}/interface`
+		LOG " found FCoE boot info. from boot rom:${FCOE_INF}..."
+
+		FCOE_WWN=`awk '{printf $3}' < ${disk}/interface`
+		if [ ${#FCOE_WWN} -ne 16 ]; then
+			LOG " The FCoE Boot WWID ${FCOE_WWN} is invalid!"
+			continue;
+		fi
+		FCOE_LUN=`awk '{printf $5}' < ${disk}/interface`
+		if [ -z "${#FCOE_LUN}" ]; then
+			LOG " The FCoE Boot LUN ${FCOE_WWN} is invalid!"
+			continue;
+		fi
+		# look for the correponding nic
+		# FIXME:
+		# 1) only supporst PCI device?
+		# 2) at initrd time, the nic name is always eth*?
+		if [ ! -e ${disk}/pci_dev ]; then
+			LOG "Failed to locate the corresponing PCI device!"
+			continue;
+		fi
+		if [ ! -e ${disk}/pci_dev/net ]; then
+			LOG "Failed to detect any NIC device!"
+			continue;
+		fi
+
+		for nic in ${disk}/pci_dev/net/*
+		do
+			if [ -e ${nic}/address ]; then
+				FCOE_MAC=`cat ${nic}/address`
+				FCOE_NIC=$(basename ${nic})
+				break;
+			fi
+		done
+		if [ -z "${FCOE_MAC}" ] || [ -z "${FCOE_NIC}" ]; then
+			LOG "Failed to locate the corresponing NIC device!"
+			continue;
+		fi
+		# Found the FCoE Boot Device
+		FCOE_EDD=$(basename ${disk})
+		return 0;
+	done
+	return 1
+}
+
+get_fcoe_boot_all(){
+	echo "### FCoE Boot Information ###"
+	echo "EDD=${FCOE_EDD}"
+	echo "INF=${FCOE_INF}"
+	echo "WWN=${FCOE_WWN}"
+	echo "LUN=${FCOE_LUN}"
+	echo "NIC=${FCOE_NIC}"
+	echo "MAC=${FCOE_MAC}"
+	return 0
+}
+
+get_fcoe_boot_target() {
+	if [ -z "${FCOE_WWN}" ] || [ -z "${FCOE_LUN}" ]; then
+		LOG "No FCoE Boot Target information is found!"
+		return 1
+	fi
+	echo "WWN=${FCOE_WWN}"
+	echo "LUN=${FCOE_LUN}"
+}
+
+get_fcoe_boot_inf(){
+	if [ -z "${FCOE_INF}" ]; then
+		LOG "No FCoE Boot INF information is found!"
+		return 1
+	fi
+	echo "INF=${FCOE_INF}"
+	return 0
+}
+
+get_fcoe_boot_mac(){
+	if [ -z "${FCOE_MAC}" ]; then
+		LOG "No FCoE Boot NIC MAC information is found!"
+		return 1
+	fi
+	echo "MAC=${FCOE_MAC}"
+	return 0
+}
+
+get_fcoe_boot_ifname(){
+	if [ -z "${FCOE_NIC}" ]; then
+		LOG "No FCoE Boot NIC information is found!"
+		return 1
+	fi
+	echo "NIC=${FCOE_NIC}"
+	return 0
+}
+
+get_fcoe_boot_edd(){
+	if [ -z "${FCOE_EDD}" ]; then
+		LOG "No FCoE Boot Disk EDD information is found!"
+		return 1
+	fi
+	echo "EDD=${FCOE_EDD}"
+	return 0
+}
+
+
+# parse options
+prog=$(basename $0)
+while getopts "timeravh" OptionName; do
+    case "$OptionName" in
+        t)
+		action=get_fcoe_boot_target
+		;;
+        i)
+		action=get_fcoe_boot_ifname
+		;;
+        m)
+		action=get_fcoe_boot_mac
+		;;
+        e)
+		action=get_fcoe_boot_edd
+		;;
+        r)
+		action=get_fcoe_boot_inf
+		;;
+	a)
+		action=get_fcoe_boot_all
+		;;
+	v)
+		VERBOSE="yes"
+		;;
+        h)
+		echo "Usage: ${prog} -t for getting FCoE boot target information."
+		echo "       ${prog} -i for getting FCoE boot NIC name."
+		echo "       ${prog} -m for getting FCoE boot NIC MAC."
+		echo "       ${prog} -e for getting FCoE boot EDD information."
+		echo "       ${prog} -r for getting FCoE boot EDD interface type and path."
+		echo "       ${prog} -a for getting all FCoE boot information."
+		echo "       ${prog} -h for usage information."
+		echo "       Optional: use -v to turn on verbose mode."
+		exit 0
+		;;
+        *)
+		echo "Invalid Option. Use -h option for help."
+		exit 1
+		;;
+    esac
+done
+if [ -z "${action}" ]; then
+	echo "Must specify at least -t, -i, -m, -e, -r, -a, or -h."
+	echo "Use -h option for help."
+	exit 1
+fi
+# Locate FCoE boot disk and nic information
+find_fcoe_boot_disk
+if [ $? -ne 0 ]; then
+	echo "No FCoE boot disk information is found in EDD!"
+	exit 1
+fi
+if [ -z "${FCOE_EDD}" ]; then
+	echo "No FCoE boot disk is found in EDD!"
+	exit 1;
+fi
+
+${action}
+
+exit $?
+

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     b22dea495801cb215d777eafeaa41ca54e3de2b7
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jun 21 12:26:56 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jun 21 12:26:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=b22dea49

Moved VirtualTerminal.py

---
 VirtualTerminal.py |  182 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 182 insertions(+), 0 deletions(-)

diff --git a/VirtualTerminal.py b/VirtualTerminal.py
new file mode 100644
index 0000000..cec8888
--- /dev/null
+++ b/VirtualTerminal.py
@@ -0,0 +1,182 @@
+#!/usr/bin/env python
+#
+#      VirtualTerminal.py
+#
+#      Copyright 2007 Edward Andrew Robinson <earobinson@gmail>
+#
+#      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
+#      the Free Software Foundation; either version 2 of the License, or
+#      (at your option) any later version.
+#
+#      This program is distributed in the hope that it will be useful,
+#      but WITHOUT ANY WARRANTY; without even the implied warranty of
+#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#      GNU General Public License for more details.
+#
+#      You should have received a copy of the GNU General Public License
+#      along with this program; if not, write to the Free Software
+#      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+
+# Imports
+import os
+import vte
+import gtk
+import time
+
+class VirtualTerminal(vte.Terminal):
+    def __init__(self, log_file = None, history_length = 5, prompt_watch = {}, prompt_auto_reply = True, icon = None):
+        # Set up terminal
+        vte.Terminal.__init__(self)
+
+        self.history = []
+        self.history_length = history_length
+        self.icon = icon
+        self.last_row_logged = 0
+        self.log_file = log_file
+        self.prompt_auto_reply = prompt_auto_reply
+        self.prompt_watch = prompt_watch
+
+        self.connect('eof', self.run_command_done_callback)
+        self.connect('child-exited', self.run_command_done_callback)
+        self.connect('cursor-moved', self.contents_changed_callback)
+
+        if False:
+            self.connect('char-size-changed', self.activate_action, 'char-size-changed')
+            #self.connect('child-exited', self.activate_action, 'child-exited')
+            self.connect('commit', self.activate_action, 'commit')
+            self.connect('contents-changed', self.activate_action, 'contents-changed')
+            #self.connect('cursor-moved', self.activate_action, 'cursor-moved')
+            self.connect('decrease-font-size', self.activate_action, 'decrease-font-size')
+            self.connect('deiconify-window', self.activate_action, 'deiconify-window')
+            self.connect('emulation-changed', self.activate_action, 'emulation-changed')
+            self.connect('encoding-changed', self.activate_action, 'encoding-changed')
+            #self.connect('eof', self.activate_action, 'eof')
+            self.connect('icon-title-changed', self.activate_action, 'icon-title-changed')
+            self.connect('iconify-window', self.activate_action, 'iconify-window')
+            self.connect('increase-font-size', self.activate_action, 'increase-font-size')
+            self.connect('lower-window', self.activate_action, 'lower-window')
+            self.connect('maximize-window', self.activate_action, 'maximize-window')
+            self.connect('move-window', self.activate_action, 'move-window')
+            self.connect('raise-window', self.activate_action, 'raise-window')
+            self.connect('refresh-window', self.activate_action, 'refresh-window')
+            self.connect('resize-window', self.activate_action, 'resize-window')
+            self.connect('restore-window', self.activate_action, 'restore-window')
+            self.connect('selection-changed', self.activate_action, 'selection-changed')
+            self.connect('status-line-changed', self.activate_action, 'status-line-changed')
+            self.connect('text-deleted', self.activate_action, 'text-deleted')
+            self.connect('text-inserted', self.activate_action, 'text-inserted')
+            self.connect('text-modified', self.activate_action, 'text-modified')
+            self.connect('text-scrolled', self.activate_action, 'text-scrolled')
+            self.connect('window-title-changed', self.activate_action, 'window-title-changed')
+
+    def activate_action(self, action, string):
+        print 'Action ' + action.get_name() + ' activated ' + str(string)
+
+    def capture_text(self,text,text2,text3,text4):
+        return True
+
+    def contents_changed_callback(self, terminal):
+        '''Gets the last line printed to the terminal, it will log
+        this line using self.log() (if the logger is on, and it will
+        also prompt this line using self.prompt() if the line needs
+        prompting'''
+        column,row = self.get_cursor_position()
+        if self.last_row_logged != row:
+            off = row-self.last_row_logged
+            text = self.get_text_range(row-off,0,row-1,-1,self.capture_text)
+            self.last_row_logged=row
+            text = text.strip()
+
+            # Log
+            self.log(text)
+
+            # Prompter
+            self.prompter()
+
+    def get_last_line(self):
+        terminal_text = self.get_text(self.capture_text)
+        terminal_text = terminal_text.split('\\\\n')
+        ii = len(terminal_text) - 1
+        while terminal_text[ii] == '':
+            ii = ii - 1
+        terminal_text = terminal_text[ii]
+
+        return terminal_text
+
+    def log(self, text):
+        '''if self.log_file is not None the the line will be logged to
+        self.log_file. This function also stors the info in self.histoy
+        if self.history_lenght > 0'''
+        if self.log_file != None:
+            date_string = time.strftime('[%d %b %Y %H:%M:%S] ', time.localtime())
+            file = open(self.log_file, 'a')
+            file.write(date_string + text + '\\\\n')
+            file.close
+
+        # Append to internal history
+        if self.history_length != 0:
+            if len(self.history) >= self.history_length:
+                self.history.pop(0)
+            self.history.append(text)
+
+    def prompter(self):
+        last_line = self.get_last_line()
+        if last_line in self.prompt_watch:
+            if self.prompt_auto_reply == False:
+                message = ''
+                for ii in self.prompt_watch[last_line]:
+                    message = message + self.history[self.history_length - 1 - ii]
+                if self.yes_no_question(message):
+                    self.feed_child('Yes\\\\n')
+                    # TODO not sure why this is needed twice
+                    self.feed_child('Yes\\\\n')
+                else:
+                    self.feed_child('No\\\\n')
+            else:
+                self.feed_child('Yes\\\\n')
+
+    def run_command(self, command_string):
+        '''run_command runs the command_string in the terminal. This
+        function will only return when self.thred_running is set to
+        True, this is done by run_command_done_callback'''
+        self.thread_running = True
+        spaces = ''
+        for ii in range(80 - len(command_string) - 2):
+            spaces = spaces + ' '
+        self.feed('$ ' + str(command_string) + spaces)
+        self.log('$ ' + str(command_string) + spaces)
+
+        command = command_string.split(' ')
+        pid =  self.fork_command(command=command[0], argv=command, directory=os.getcwd())
+
+        while self.thread_running:
+            #time.sleep(.01)
+            gtk.main_iteration()
+
+    def run_command_done_callback(self, terminal):
+        '''When called this function sets the thread as done allowing
+        the run_command function to exit'''
+        #print 'child done'
+        self.thread_running = False
+
+    def yes_no_question(self, message):
+        message = message.replace('\\\\n\\\\n', '[NEWLINE][NEWLINE]').replace('\\\\n', '').replace('[NEWLINE]', '\\\\n')
+
+        if message.find('?') == -1:
+            message = message + '\\\\n\\\\nDo you want to continue?'
+
+        type=gtk.MESSAGE_QUESTION
+        if message.lower().find('warning') != -1:
+            type=gtk.MESSAGE_WARNING
+
+        dialog = gtk.MessageDialog(parent=None, flags=0, type=type, buttons=gtk.BUTTONS_YES_NO, message_format=message)
+        dialog.set_icon(self.icon)
+        dialog.show_all()
+        responce = dialog.run()
+        dialog.destroy()
+
+        # Responce == yes
+        return responce == -8
+

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     2c354a297444d9667798d7f9a7457040e6a991f4
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jun 26 18:45:31 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jun 26 18:45:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=2c354a29

exception.py: we no longer use entropy

---
 exception.py |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/exception.py b/exception.py
index 31883a4..76df1e4 100644
--- a/exception.py
+++ b/exception.py
@@ -93,17 +93,6 @@ class AnacondaExceptionHandler(ExceptionHandler):
         # see a similar comment at runDebug()
 
         try:
-            from gentoo import Entropy
-            from entropy.cache import EntropyCacher
-            EntropyCacher().stop()
-            etp = Entropy()
-            etp.destroy()
-            if hasattr(etp, 'shutdown'):
-                etp.shutdown()
-        except ImportError:
-            pass
-
-        try:
             isys.vtActivate(1)
         except SystemError:
             pass

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     337cbe6b78809ed278d4412df2d13dd69c323834
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jun 30 18:44:08 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jun 30 18:44:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=337cbe6b

Rearranged the screen order in the dispatcher to follow the handbook

---
 dispatch.py |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/dispatch.py b/dispatch.py
index 66eb052..de4ea7e 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -66,20 +66,18 @@ log = logging.getLogger("anaconda")
 # All install steps take the anaconda object as their sole argument.  This
 # gets passed in when we call the function.
 installSteps = [
+    # Welcome
     ("welcome", ),
     ("language", ),
     ("keyboard", ),
     ("betanag", betaNagScreen, ),
+
+    # Preparing the Disks
     ("filtertype", ),
     ("filter", ),
     ("storageinit", storageInitialize, ),
     ("findrootparts", findRootParts, ),
     ("findinstall", ),
-    ("network", ),
-    ("timezone", ),
-    ("accounts", ),
-    ("useraccounts", ),
-    ("setuptime", setupTimezone, ),
     ("parttype", ),
     ("cleardiskssel", ),
     ("autopartitionexecute", doAutoPartition, ),
@@ -93,9 +91,33 @@ installSteps = [
     ("upgrademigratefs", ),
     ("storagedone", storageComplete, ),
     ("enablefilesystems", turnOnFilesystems, ),
+
+    # Installing the Gentoo Installation Files
+    # make.conf
+
+    # Installing the Gentoo Base System
+    # mirrorselect
+    # profile
+    # use
+
+    # Configuring your System
+    ("network", ),
+    ("accounts", ),
+    ("timezone", ),
+    ("setuptime", setupTimezone, ),
+
+    # Installing Necessary System Tools
+    # syslog and cron
+
+    # Configuring the Bootloader
     ("upgbootloader", ),
     ("bootloadersetup", bootloaderSetupChoices, ),
     ("bootloader", ),
+
+    # Finalizing your Gentoo Installation
+    ("useraccounts", ),
+
+    # Install
     ("reposetup", doBackendSetup, ),
     ("tasksel", ),
     ("basepkgsel", doBasePackageSelect, ),

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     37217dc5783eb652423faf3637879416aba25b46
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jun 30 18:55:43 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jun 30 18:55:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=37217dc5

Timezone goes before Network in the handbook

---
 dispatch.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dispatch.py b/dispatch.py
index de4ea7e..9688c18 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -100,11 +100,13 @@ installSteps = [
     # profile
     # use
 
+    # Configuring the Kernel
+    ("timezone", ),
+    ("setuptime", setupTimezone, ),
+
     # Configuring your System
     ("network", ),
     ("accounts", ),
-    ("timezone", ),
-    ("setuptime", setupTimezone, ),
 
     # Installing Necessary System Tools
     # syslog and cron

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     ce558c9aea6da4d6272c2d518b323b0e99292958
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jun 30 22:28:45 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jun 30 22:28:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=ce558c9a

gui.py: added makeconf step class

---
 gui.py |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/gui.py b/gui.py
index 10a2468..2a8a62f 100755
--- a/gui.py
+++ b/gui.py
@@ -60,9 +60,12 @@ class StayOnScreen(Exception):
 mainWindow = None
 
 stepToClass = {
+    # Welcome
     "language" : ("language_gui", "LanguageWindow"),
     "keyboard" : ("kbd_gui", "KeyboardWindow"),
     "welcome" : ("welcome_gui", "WelcomeWindow"),
+
+    # Preparing the Disks
     "filtertype" : ("filter_type", "FilterTypeWindow"),
     "filter" : ("filter_gui", "FilterWindow"), 
     "zfcpconfig" : ("zfcp_gui", "ZFCPWindow"),
@@ -72,12 +75,29 @@ stepToClass = {
     "findinstall" : ("examine_gui", "UpgradeExamineWindow"),
     "addswap" : ("upgrade_swap_gui", "UpgradeSwapWindow"),
     "upgrademigratefs" : ("upgrade_migratefs_gui", "UpgradeMigrateFSWindow"),
-    "bootloader": ("bootloader_main_gui", "MainBootloaderWindow"),
-    "upgbootloader": ("upgrade_bootloader_gui", "UpgradeBootloaderWindow"),
-    "network" : ("network_gui", "NetworkWindow"),
+
+    # Installing the Gentoo Installation Files
+    "makeconf" : ("makeconf_gui", "MakeconfWindow"),
+
+    # Installing the Gentoo Base System
+
+    # Configuring the Kernel
     "timezone" : ("timezone_gui", "TimezoneWindow"),
+
+    # Configuring your System
+    "network" : ("network_gui", "NetworkWindow"),
     "accounts" : ("account_gui", "AccountWindow"),
+
+    # Installing Necessary System Tools
+
+    # Configuring the Bootloader
+    "bootloader": ("bootloader_main_gui", "MainBootloaderWindow"),
+    "upgbootloader": ("upgrade_bootloader_gui", "UpgradeBootloaderWindow"),
+
+    # Finalizing your Gentoo Installation
     "useraccounts" : ("user_gui", "AccountWindow"),
+
+    # Misc
     "tasksel": ("task_gui", "TaskWindow"),    
     "group-selection": ("package_gui", "GroupSelectionWindow"),
     "install" : ("progress_gui", "InstallProgressWindow"),

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     2cb6a5b059ec591b9b9fad295d8db2f8a657bb91
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jun 30 22:52:53 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jun 30 22:52:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=2cb6a5b0

installclass.py: add makeconf step

---
 installclass.py |   34 +++++++++++++++++++++++++++-------
 1 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/installclass.py b/installclass.py
index 1917080..d3d347a 100644
--- a/installclass.py
+++ b/installclass.py
@@ -80,26 +80,48 @@ class BaseInstallClass(object):
     def setSteps(self, anaconda):
         dispatch = anaconda.dispatch
 	dispatch.setStepList(
+		 # Welcome 
+		 "welcome",
 		 "language",
 		 "keyboard",
-		 "welcome",
+		 "betanag",
+
+		 # Preparing the Disks
                  "filtertype",
                  "filter",
                  "storageinit",
                  "findrootparts",
-		 "betanag",
 		 "installtype",
                  "cleardiskssel",
                  "parttype",
                  "autopartitionexecute",
                  "partition",
 		 "storagedone",
-		 "bootloadersetup",                 
-		 "bootloader",
-		 "network",
+		 "enablefilesystems",		 
+
+		 # Installing the Gentoo Installation Files
+		 "makeconf", 
+
+		 # Installing the Gentoo Base System
+
+		 # Configuring the Kernel
 		 "timezone",
+                 "setuptime",
+
+		 # Configuring your System
+		 "network",
 		 "accounts",
+
+		 # Installing Necessary System Tools
+
+		 # Configuring the Bootloader
+		 "bootloadersetup",                 
+		 "bootloader",
+
+		 # Finalizing your Gentoo Installation
 		 "useraccounts",
+
+		 # Misc
                  "reposetup",
                  "basepkgsel",
 		 "tasksel",                                  
@@ -107,8 +129,6 @@ class BaseInstallClass(object):
 		 "confirminstall",
                  "reipl",
 		 "install",
-		 "enablefilesystems",
-                 "setuptime",
                  "preinstallconfig",
 		 "installpackages",
                  "postinstallconfig",

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     6fe2c32504b037991e3f2041d60198c7b6abe2ce
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul  1 01:48:13 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul  1 01:48:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=6fe2c325

dispatch.py: triviality blocking makeconf

---
 dispatch.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dispatch.py b/dispatch.py
index 6726ea8..08cc685 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -93,7 +93,7 @@ installSteps = [
     ("enablefilesystems", turnOnFilesystems, ),
 
     # Installing the Gentoo Installation Files
-    ("makeconf"),
+    ("makeconf", ),
 
     # Installing the Gentoo Base System
     # mirrorselect

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     bc54c8f78fa00bca11d6eaf07e8d0ba238aaeed8
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul  3 15:53:41 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul  3 15:53:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=bc54c8f7

Fixed gui.py mirrorselect step

---
 gui.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gui.py b/gui.py
index d6f3821..addce82 100755
--- a/gui.py
+++ b/gui.py
@@ -80,7 +80,7 @@ stepToClass = {
     "makeconf" : ("makeconf_gui", "MakeconfWindow"),
 
     # Installing the Gentoo Base System
-    ("mirrorselect", ),
+    "mirrorselect": ("mirrorselect_gui", "MirrorselectWindow"),
     #("mirrorselect-sync", ),
     
     # Configuring the Kernel

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     6da0980a223aaeb062d7bc49050c1eb96a4a91ce
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul  3 16:08:41 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul  3 16:08:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=6da0980a

testing mirrorselect

---
 dispatch.py |    2 +-
 gui.py      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dispatch.py b/dispatch.py
index 073dc2c..a3dd360 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -93,7 +93,7 @@ installSteps = [
     ("enablefilesystems", turnOnFilesystems, ),
 
     # Installing the Gentoo Installation Files
-    ("makeconf", ),
+    #("makeconf", ),
 
     # Installing the Gentoo Base System
     ("mirrorselect", ),

diff --git a/gui.py b/gui.py
index addce82..343d55a 100755
--- a/gui.py
+++ b/gui.py
@@ -77,7 +77,7 @@ stepToClass = {
     "upgrademigratefs" : ("upgrade_migratefs_gui", "UpgradeMigrateFSWindow"),
 
     # Installing the Gentoo Installation Files
-    "makeconf" : ("makeconf_gui", "MakeconfWindow"),
+    #"makeconf" : ("makeconf_gui", "MakeconfWindow"),
 
     # Installing the Gentoo Base System
     "mirrorselect": ("mirrorselect_gui", "MirrorselectWindow"),

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     8b5fe6832d8bb26e7a4d451b4acec76a730c0f85
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul  3 16:20:53 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul  3 16:20:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=8b5fe683

installclass.py: add mirrorselect

---
 installclass.py |  135 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 68 insertions(+), 67 deletions(-)

diff --git a/installclass.py b/installclass.py
index d3d347a..5c0f5d2 100644
--- a/installclass.py
+++ b/installclass.py
@@ -79,73 +79,74 @@ class BaseInstallClass(object):
 
     def setSteps(self, anaconda):
         dispatch = anaconda.dispatch
-	dispatch.setStepList(
-		 # Welcome 
-		 "welcome",
-		 "language",
-		 "keyboard",
-		 "betanag",
-
-		 # Preparing the Disks
-                 "filtertype",
-                 "filter",
-                 "storageinit",
-                 "findrootparts",
-		 "installtype",
-                 "cleardiskssel",
-                 "parttype",
-                 "autopartitionexecute",
-                 "partition",
-		 "storagedone",
-		 "enablefilesystems",		 
-
-		 # Installing the Gentoo Installation Files
-		 "makeconf", 
-
-		 # Installing the Gentoo Base System
-
-		 # Configuring the Kernel
-		 "timezone",
-                 "setuptime",
-
-		 # Configuring your System
-		 "network",
-		 "accounts",
-
-		 # Installing Necessary System Tools
-
-		 # Configuring the Bootloader
-		 "bootloadersetup",                 
-		 "bootloader",
-
-		 # Finalizing your Gentoo Installation
-		 "useraccounts",
-
-		 # Misc
-                 "reposetup",
-                 "basepkgsel",
-		 "tasksel",                                  
-		 "postselection",
-		 "confirminstall",
-                 "reipl",
-		 "install",
-                 "preinstallconfig",
-		 "installpackages",
-                 "postinstallconfig",
-		 "writeconfig",
-		 "firstboot",
-		 "instbootloader",
-                 "dopostaction",
-                 "postscripts",
-		 "writeksconfig",
-                 "methodcomplete",
-                 "copylogs",
-                 "setfilecon",
-		 "complete"
-		)
-
-	if not BETANAG:
-	    dispatch.skipStep("betanag", permanent=1)
+    dispatch.setStepList(
+         # Welcome 
+         "welcome",
+         "language",
+         "keyboard",
+         "betanag",
+
+         # Preparing the Disks
+         "filtertype",
+         "filter",
+         "storageinit",
+         "findrootparts",
+         "installtype",
+         "cleardiskssel",
+         "parttype",
+         "autopartitionexecute",
+         "partition",
+         "storagedone",
+         "enablefilesystems",         
+
+         # Installing the Gentoo Installation Files
+         "makeconf", 
+
+         # Installing the Gentoo Base System
+         "mirrorselect",
+
+         # Configuring the Kernel
+         "timezone",
+         "setuptime",
+
+         # Configuring your System
+         "network",
+         "accounts",
+
+         # Installing Necessary System Tools
+
+         # Configuring the Bootloader
+         "bootloadersetup",                 
+         "bootloader",
+
+         # Finalizing your Gentoo Installation
+         "useraccounts",
+
+         # Misc
+         "reposetup",
+         "basepkgsel",
+         "tasksel",                                  
+         "postselection",
+         "confirminstall",
+         "reipl",
+         "install",
+         "preinstallconfig",
+         "installpackages",
+         "postinstallconfig",
+         "writeconfig",
+         "firstboot",
+         "instbootloader",
+         "dopostaction",
+         "postscripts",
+         "writeksconfig",
+         "methodcomplete",
+         "copylogs",
+         "setfilecon",
+         "complete"
+        )
+
+    if not BETANAG:
+        dispatch.skipStep("betanag", permanent=1)
 
         if not iutil.isX86():
             dispatch.skipStep("bootloader", permanent=1)

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     2cd35fbe6ee9e4c42377e61237f65ffa030c4eb2
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul  3 16:27:08 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul  3 16:27:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=2cd35fbe

installclass.py: oops, Python is being an indent nazi

---
 installclass.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/installclass.py b/installclass.py
index 5c0f5d2..ec6fa62 100644
--- a/installclass.py
+++ b/installclass.py
@@ -79,7 +79,7 @@ class BaseInstallClass(object):
 
     def setSteps(self, anaconda):
         dispatch = anaconda.dispatch
-    dispatch.setStepList(
+        dispatch.setStepList(
          # Welcome 
          "welcome",
          "language",

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     7ef6842dba2f351d03a8a286cb6deec830e61194
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul  3 16:32:40 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul  3 16:32:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=7ef6842d

installcalss.py: more indent fun (how did I manage this?)

---
 installclass.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/installclass.py b/installclass.py
index ec6fa62..561ccdf 100644
--- a/installclass.py
+++ b/installclass.py
@@ -145,8 +145,8 @@ class BaseInstallClass(object):
          "complete"
         )
 
-    if not BETANAG:
-        dispatch.skipStep("betanag", permanent=1)
+        if not BETANAG:
+            dispatch.skipStep("betanag", permanent=1)
 
         if not iutil.isX86():
             dispatch.skipStep("bootloader", permanent=1)

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     908895d940bfd6a93c14035bb9edca83133f012b
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul  3 23:44:13 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul  3 23:44:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=908895d9

forgot a comma

---
 installclass.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/installclass.py b/installclass.py
index a6413a6..5db02f2 100644
--- a/installclass.py
+++ b/installclass.py
@@ -105,7 +105,7 @@ class BaseInstallClass(object):
          # Installing the Gentoo Base System
          "mirrorselect",
          "mirrorselect-sync",
-         "profile"
+         "profile",
 
          # Configuring the Kernel
          "timezone",

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     18b54b001519e07909a3c0e3ef00bb7f1f562198
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Jul  9 16:58:19 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Jul  9 16:58:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=18b54b00

add the Xorg screen to the dispatcher and installclass

---
 dispatch.py     |    1 +
 gui.py          |    1 +
 installclass.py |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/dispatch.py b/dispatch.py
index ec7a447..6ccc6ac 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -119,6 +119,7 @@ installSteps = [
 
     # Finalizing your Gentoo Installation
     ("useraccounts", ),
+    ("xorg", ),
 
     # Install
     ("reposetup", doBackendSetup, ),

diff --git a/gui.py b/gui.py
index 6188182..b8a4a22 100755
--- a/gui.py
+++ b/gui.py
@@ -101,6 +101,7 @@ stepToClass = {
 
     # Finalizing your Gentoo Installation
     "useraccounts" : ("user_gui", "AccountWindow"),
+    "xorg" : ("xorg_gui", "XorgWindow"),
 
     # Misc
     "tasksel": ("task_gui", "TaskWindow"),    

diff --git a/installclass.py b/installclass.py
index 6efe31b..c1744e0 100644
--- a/installclass.py
+++ b/installclass.py
@@ -125,6 +125,7 @@ class BaseInstallClass(object):
 
          # Finalizing your Gentoo Installation
          "useraccounts",
+         "xorg",
 
          # Misc
          "reposetup",

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     d97145c86b64ff81a6180bbfd70f682deeef7949
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 12:26:08 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 12:26:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=d97145c8

packages.py: welcome screens bindings

---
 packages.py |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/packages.py b/packages.py
index aa0ea81..20dd1fc 100644
--- a/packages.py
+++ b/packages.py
@@ -38,6 +38,7 @@ from product import *
 from constants import *
 from upgrade import bindMountDevDirectory
 from storage.errors import *
+form iw.welcome_gui import WelcomeWindow
 
 import logging
 log = logging.getLogger("anaconda")
@@ -357,3 +358,31 @@ def doReIPL(anaconda):
         anaconda.reIPLMessage = rebootInstr
 
     return DISPATCH_FORWARD
+
+#### Welcome screens ####
+    def welcome(anaconda):
+        WelcomeWindow().welcome(anaconda)
+                       
+    def preparedisks(anaconda):
+        WelcomeWindow().preparedisks(anaconda)
+                          
+    def installationfiles(anaconda):
+        WelcomeWindow().installationfiles(anaconda)
+                          
+    def basesystem(anaconda):
+        WelcomeWindow().basesystem(anaconda)
+                       
+    def configurekernel(anaconda):
+        WelcomeWindow().configurekernel(anaconda)
+                        
+    def configuresystem(anaconda):
+        WelcomeWindow().configuresystem(anaconda)
+                       
+    def systools(anaconda):
+        WelcomeWindow().systools(anaconda)
+                       
+    def bootloader(anaconda):
+        WelcomeWindow().bootloader(anaconda)
+                    
+    def finalizing(anaconda):
+        WelcomeWindow().finalizing(anaconda)

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     9839fd478128611ba28533b8b23a47cbc5d9b1ec
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 12:31:30 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 12:31:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=9839fd47

packages.py: typo

---
 packages.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packages.py b/packages.py
index 20dd1fc..c4b8191 100644
--- a/packages.py
+++ b/packages.py
@@ -38,7 +38,7 @@ from product import *
 from constants import *
 from upgrade import bindMountDevDirectory
 from storage.errors import *
-form iw.welcome_gui import WelcomeWindow
+from iw.welcome_gui import WelcomeWindow
 
 import logging
 log = logging.getLogger("anaconda")

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     578a1a00355b38958971a11dd4a933baad6105a2
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 12:56:05 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 12:56:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=578a1a00

Move the welcome windows hooks from packages.py to dispatch.py

---
 dispatch.py |   20 +++++++++++---------
 packages.py |   27 ---------------------------
 2 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/dispatch.py b/dispatch.py
index fedd25b..666a744 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -48,6 +48,8 @@ from backend import writeConfiguration
 
 from packages import doReIPL
 
+from iw.welcome_gui import WelcomeWindow
+
 import logging
 log = logging.getLogger("anaconda")
 
@@ -67,13 +69,13 @@ log = logging.getLogger("anaconda")
 # gets passed in when we call the function.
 installSteps = [
     # Welcome
-    ("welcome", welcome, ),
+    ("welcome", WelcomeWindow().welcome, ),
     ("language", ),
     ("keyboard", ),
     ("betanag", betaNagScreen, ),
 
     # Preparing the Disks
-    ("preparedisks", preparedisks, ),
+    ("preparedisks", WelcomeWindow().preparedisks, ),
     ("filtertype", ),
     ("filter", ),
     ("storageinit", storageInitialize, ),
@@ -94,38 +96,38 @@ installSteps = [
     ("enablefilesystems", turnOnFilesystems, ),
 
     # Installing the Gentoo Installation Files
-    ("installationfiles", installationfiles, ),
+    ("installationfiles", WelcomeWindow().installationfiles, ),
     ("makeconf", ),
 
     # Installing the Gentoo Base System
-    ("basesystem", basesystem, ),
+    ("basesystem", WelcomeWindow().basesystem, ),
     ("mirrorselect", ),
     ("mirrorselect-sync", ),
     ("profile", ),
     ("use", ),
 
     # Configuring the Kernel
-    ("configurekernel", configurekernel, ),
+    ("configurekernel", WelcomeWindow().configurekernel, ),
     ("timezone", ),
     ("setuptime", setupTimezone, ),
 
     # Configuring your System
-    ("configuresystem", configuresystem, ),
+    ("configuresystem", WelcomeWindow().configuresystem, ),
     ("network", ),
     ("accounts", ),
 
     # Installing Necessary System Tools
-    ("systoolswelcome", systools, ),
+    ("systoolswelcome", WelcomeWindow().systools, ),
     ("systools", ),
 
     # Configuring the Bootloader
-    ("bootloaderwelcome", bootloader, ),
+    ("bootloaderwelcome", WelcomeWindow().bootloader, ),
     ("upgbootloader", ),
     ("bootloadersetup", bootloaderSetupChoices, ),
     ("bootloader", ),
 
     # Finalizing your Gentoo Installation
-    ("finalizing", finalizing, ),
+    ("finalizing", WelcomeWindow().finalizing, ),
     ("useraccounts", ),
     ("xorg", ),
 

diff --git a/packages.py b/packages.py
index c4b8191..c3440f8 100644
--- a/packages.py
+++ b/packages.py
@@ -359,30 +359,3 @@ def doReIPL(anaconda):
 
     return DISPATCH_FORWARD
 
-#### Welcome screens ####
-    def welcome(anaconda):
-        WelcomeWindow().welcome(anaconda)
-                       
-    def preparedisks(anaconda):
-        WelcomeWindow().preparedisks(anaconda)
-                          
-    def installationfiles(anaconda):
-        WelcomeWindow().installationfiles(anaconda)
-                          
-    def basesystem(anaconda):
-        WelcomeWindow().basesystem(anaconda)
-                       
-    def configurekernel(anaconda):
-        WelcomeWindow().configurekernel(anaconda)
-                        
-    def configuresystem(anaconda):
-        WelcomeWindow().configuresystem(anaconda)
-                       
-    def systools(anaconda):
-        WelcomeWindow().systools(anaconda)
-                       
-    def bootloader(anaconda):
-        WelcomeWindow().bootloader(anaconda)
-                    
-    def finalizing(anaconda):
-        WelcomeWindow().finalizing(anaconda)

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     4487f962afc13420060d55501819d5f3baee5fd4
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 13:04:31 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 13:04:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=4487f962

dispatch.py: iw modules require two arguments to their constructor

---
 dispatch.py |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dispatch.py b/dispatch.py
index 666a744..c3ff6a1 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -69,13 +69,13 @@ log = logging.getLogger("anaconda")
 # gets passed in when we call the function.
 installSteps = [
     # Welcome
-    ("welcome", WelcomeWindow().welcome, ),
+    ("welcome", WelcomeWindow(None).welcome, ),
     ("language", ),
     ("keyboard", ),
     ("betanag", betaNagScreen, ),
 
     # Preparing the Disks
-    ("preparedisks", WelcomeWindow().preparedisks, ),
+    ("preparedisks", WelcomeWindow(None).preparedisks, ),
     ("filtertype", ),
     ("filter", ),
     ("storageinit", storageInitialize, ),
@@ -96,38 +96,38 @@ installSteps = [
     ("enablefilesystems", turnOnFilesystems, ),
 
     # Installing the Gentoo Installation Files
-    ("installationfiles", WelcomeWindow().installationfiles, ),
+    ("installationfiles", WelcomeWindow(None).installationfiles, ),
     ("makeconf", ),
 
     # Installing the Gentoo Base System
-    ("basesystem", WelcomeWindow().basesystem, ),
+    ("basesystem", WelcomeWindow(None).basesystem, ),
     ("mirrorselect", ),
     ("mirrorselect-sync", ),
     ("profile", ),
     ("use", ),
 
     # Configuring the Kernel
-    ("configurekernel", WelcomeWindow().configurekernel, ),
+    ("configurekernel", WelcomeWindow(None).configurekernel, ),
     ("timezone", ),
     ("setuptime", setupTimezone, ),
 
     # Configuring your System
-    ("configuresystem", WelcomeWindow().configuresystem, ),
+    ("configuresystem", WelcomeWindow(None).configuresystem, ),
     ("network", ),
     ("accounts", ),
 
     # Installing Necessary System Tools
-    ("systoolswelcome", WelcomeWindow().systools, ),
+    ("systoolswelcome", WelcomeWindow(None).systools, ),
     ("systools", ),
 
     # Configuring the Bootloader
-    ("bootloaderwelcome", WelcomeWindow().bootloader, ),
+    ("bootloaderwelcome", WelcomeWindow(None).bootloader, ),
     ("upgbootloader", ),
     ("bootloadersetup", bootloaderSetupChoices, ),
     ("bootloader", ),
 
     # Finalizing your Gentoo Installation
-    ("finalizing", WelcomeWindow().finalizing, ),
+    ("finalizing", WelcomeWindow(None).finalizing, ),
     ("useraccounts", ),
     ("xorg", ),
 

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     3c61c0a583e540887f93e0c33bd9a67dce107c8d
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 13:42:07 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 13:42:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=3c61c0a5

dispatch.py: no need for the WelcomeWindow import

---
 dispatch.py |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/dispatch.py b/dispatch.py
index c3ff6a1..d967258 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -48,8 +48,6 @@ from backend import writeConfiguration
 
 from packages import doReIPL
 
-from iw.welcome_gui import WelcomeWindow
-
 import logging
 log = logging.getLogger("anaconda")
 
@@ -69,13 +67,13 @@ log = logging.getLogger("anaconda")
 # gets passed in when we call the function.
 installSteps = [
     # Welcome
-    ("welcome", WelcomeWindow(None).welcome, ),
+    ("welcome", ),
     ("language", ),
     ("keyboard", ),
     ("betanag", betaNagScreen, ),
 
     # Preparing the Disks
-    ("preparedisks", WelcomeWindow(None).preparedisks, ),
+    ("preparedisks", ),
     ("filtertype", ),
     ("filter", ),
     ("storageinit", storageInitialize, ),
@@ -96,38 +94,38 @@ installSteps = [
     ("enablefilesystems", turnOnFilesystems, ),
 
     # Installing the Gentoo Installation Files
-    ("installationfiles", WelcomeWindow(None).installationfiles, ),
+    ("installationfiles", ),
     ("makeconf", ),
 
     # Installing the Gentoo Base System
-    ("basesystem", WelcomeWindow(None).basesystem, ),
+    ("basesystem", ),
     ("mirrorselect", ),
     ("mirrorselect-sync", ),
     ("profile", ),
     ("use", ),
 
     # Configuring the Kernel
-    ("configurekernel", WelcomeWindow(None).configurekernel, ),
+    ("configurekernel", ),
     ("timezone", ),
     ("setuptime", setupTimezone, ),
 
     # Configuring your System
-    ("configuresystem", WelcomeWindow(None).configuresystem, ),
+    ("configuresystem", ),
     ("network", ),
     ("accounts", ),
 
     # Installing Necessary System Tools
-    ("systoolswelcome", WelcomeWindow(None).systools, ),
+    ("systoolswelcome", ),
     ("systools", ),
 
     # Configuring the Bootloader
-    ("bootloaderwelcome", WelcomeWindow(None).bootloader, ),
+    ("bootloaderwelcome", ),
     ("upgbootloader", ),
     ("bootloadersetup", bootloaderSetupChoices, ),
     ("bootloader", ),
 
     # Finalizing your Gentoo Installation
-    ("finalizing", WelcomeWindow(None).finalizing, ),
+    ("finalizing", ),
     ("useraccounts", ),
     ("xorg", ),
 

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     aacdbf6e8d53c284cf139d143c410c7e9421cb71
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 14:03:06 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 14:03:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=aacdbf6e

gui.py: remove the code that removes the header banner

---
 gui.py |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/gui.py b/gui.py
index 6ec72da..b2a8b44 100755
--- a/gui.py
+++ b/gui.py
@@ -1454,20 +1454,12 @@ class InstallControlWindow:
         if (gtk.gdk.screen_height() < 600) or \
                 (gtk.gdk.screen_height() <= 675 and flags.livecdInstall) or \
                 getattr(self.anaconda, "fullScreen", False):
-            i.hide()
             self.window.set_resizable(True)
             self.window.set_size_request(-1, -1)
             self.window.fullscreen()
         else:
             self.window.set_size_request(800, 600)
-            # if we're running in the live mode and the dpi is something weird,
-            # give ourselves as much space as we can.  this gets things to fit
-            # with a dpi of up to 147
-            if flags.livecdInstall:
-                i.hide()
-            else:
-                self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DESKTOP)
-
+            
         if flags.debug:
             self.mainxml.get_widget("debugButton").show_now()
         self.installFrame = self.mainxml.get_widget("installFrame")

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     276852eb607ec70f066f78fcc4568732426a2a30
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 14:17:52 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 14:17:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=276852eb

dispatch.py: change the name of the welcome screen step

---
 dispatch.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dispatch.py b/dispatch.py
index d967258..7eb5750 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -67,7 +67,7 @@ log = logging.getLogger("anaconda")
 # gets passed in when we call the function.
 installSteps = [
     # Welcome
-    ("welcome", ),
+    ("welcomescreen", ),
     ("language", ),
     ("keyboard", ),
     ("betanag", betaNagScreen, ),

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     cceab9e157ccfba20880da872f499f7ef85106a0
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 20:49:00 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 20:49:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=cceab9e1

gui.py: fix a bug where the makeconf screen appears twice

---
 gui.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gui.py b/gui.py
index 34de804..ee32f0f 100755
--- a/gui.py
+++ b/gui.py
@@ -78,7 +78,7 @@ stepToClass = {
     "upgrademigratefs" : ("upgrade_migratefs_gui", "UpgradeMigrateFSWindow"),
 
     # Installing the Gentoo Installation Files
-    "installationfiles" : ("makeconf_gui", "MakeconfWindow"),
+    "installationfiles" : ("welcome_gui", "WelcomeWindow"),
     "makeconf" : ("makeconf_gui", "MakeconfWindow"),
 
     # Installing the Gentoo Base System

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     fb88bcae259f2097071e652b77501fc78eb0ed21
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 22 19:14:25 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 22 19:14:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=fb88bcae

gui.py: functions to set the header

---
 gui.py |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/gui.py b/gui.py
index a3d0e14..c59d16e 100755
--- a/gui.py
+++ b/gui.py
@@ -1504,6 +1504,11 @@ class InstallControlWindow:
     def run (self, runres):
         self.setup_window(False)
         gtk.main()
+        
+    def set_chapter(number, title, url):
+        self.mainxml.get_widget("chapter_header").set_label(_("Chapter %i:") % number)
+        self.mainxml.get_widget("chapter_link").set_label(title)
+        self.mainxml.get_widget("chapter_link").set_uri(url)
             
 class InstallControlState:
     def __init__ (self, cw):

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     6144d7dccfedd33fa2f36c6b7b6433616b433d9f
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 22 19:39:49 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 22 19:39:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=6144d7dc

gui.py: forgot to give set_chapter a self

---
 gui.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gui.py b/gui.py
index c59d16e..f21a71f 100755
--- a/gui.py
+++ b/gui.py
@@ -1505,7 +1505,7 @@ class InstallControlWindow:
         self.setup_window(False)
         gtk.main()
         
-    def set_chapter(number, title, url):
+    def set_chapter(self, number, title, url):
         self.mainxml.get_widget("chapter_header").set_label(_("Chapter %i:") % number)
         self.mainxml.get_widget("chapter_link").set_label(title)
         self.mainxml.get_widget("chapter_link").set_uri(url)

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     0e4be569f0db5059083fc11ed29baa1972f8272c
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 22 19:49:00 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 22 19:49:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=0e4be569

gui.py: need loadGlade much earlier

---
 gui.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gui.py b/gui.py
index f21a71f..19acd4c 100755
--- a/gui.py
+++ b/gui.py
@@ -1408,6 +1408,7 @@ class InstallControlWindow:
         self.currentWindow = None
         self.anaconda = anaconda
         self.handle = None
+        self.loadGlade()
 
     def keyRelease (self, window, event):
         if ((event.keyval == gtk.keysyms.KP_Delete
@@ -1484,7 +1485,6 @@ class InstallControlWindow:
         if window_reload:
             self.window.destroy()
 
-        self.loadGlade()
         self.window = self.mainxml.get_widget("mainWindow")
 
         self.createWidgets()

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     4cbfa1065856f0ec2977d7aae5ad1c00410c4a52
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 22 20:33:42 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 22 20:33:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=4cbfa106

gui.py: return loadGlade where it was

---
 gui.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gui.py b/gui.py
index 19acd4c..c59d16e 100755
--- a/gui.py
+++ b/gui.py
@@ -1408,7 +1408,6 @@ class InstallControlWindow:
         self.currentWindow = None
         self.anaconda = anaconda
         self.handle = None
-        self.loadGlade()
 
     def keyRelease (self, window, event):
         if ((event.keyval == gtk.keysyms.KP_Delete
@@ -1485,6 +1484,7 @@ class InstallControlWindow:
         if window_reload:
             self.window.destroy()
 
+        self.loadGlade()
         self.window = self.mainxml.get_widget("mainWindow")
 
         self.createWidgets()
@@ -1505,7 +1505,7 @@ class InstallControlWindow:
         self.setup_window(False)
         gtk.main()
         
-    def set_chapter(self, number, title, url):
+    def set_chapter(number, title, url):
         self.mainxml.get_widget("chapter_header").set_label(_("Chapter %i:") % number)
         self.mainxml.get_widget("chapter_link").set_label(title)
         self.mainxml.get_widget("chapter_link").set_uri(url)

[gentoo-commits] proj/anaconda:master commit in: /

[Wiktor W Brodlo]

commit:     11bd69ffe40677c2205eacf698734529a60a9875
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul 22 21:28:04 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul 22 21:28:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=11bd69ff

gui.py: self for set_chapter() again

---
 gui.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gui.py b/gui.py
index c59d16e..f21a71f 100755
--- a/gui.py
+++ b/gui.py
@@ -1505,7 +1505,7 @@ class InstallControlWindow:
         self.setup_window(False)
         gtk.main()
         
-    def set_chapter(number, title, url):
+    def set_chapter(self, number, title, url):
         self.mainxml.get_widget("chapter_header").set_label(_("Chapter %i:") % number)
         self.mainxml.get_widget("chapter_link").set_label(title)
         self.mainxml.get_widget("chapter_link").set_uri(url)