[F19] Small fixes for the addon patchset

[Martin Sivak]

This fixes broken updates= and some other failures we found out while
working with the branch today.

[PATCH 1/4] Move the import constants line below setupUpdates

[Martin Sivak]

---
 anaconda | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/anaconda b/anaconda
index d0b945b..cc02a5c 100755
--- a/anaconda
+++ b/anaconda
@@ -32,8 +32,6 @@

import atexit, sys, os, re, time, subprocess
 from tempfile import mkstemp
-from pyanaconda import constants
-
 # keep up with process ID of the window manager if we start it
 wm_pid = None

@@ -643,6 +641,8 @@ if __name__ == "__main__":
     setupPythonUpdates()
     setupPythonPath()

+    from pyanaconda import constants
+
     # do this early so we can set flags before initializing logging
     from pyanaconda.flags import flags
     (opts, args, depr) = parseOptions(cmdline=flags.cmdline)

[PATCH 1/4] Move the import constants line below setupUpdates

[Vratislav Podzimek]

On Tue, 2012-12-18 at 14:37 +0100, Martin Sivak wrote:
> anaconda | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

'setupPythonUpdates' should be in the commit message.
> diff --git a/anaconda b/anaconda
> index d0b945b..cc02a5c 100755
> --- a/anaconda
> +++ b/anaconda
> @@ -32,8 +32,6 @@
>
> import atexit, sys, os, re, time, subprocess
>  from tempfile import mkstemp
> -from pyanaconda import constants
>
> # keep up with process ID of the window manager if we start it
>  wm_pid = None
>
> @@ -643,6 +641,8 @@ if __name__ == "__main__":
>      setupPythonUpdates()
>      setupPythonPath()
> from pyanaconda import constants
> # do this early so we can set flags before initializing logging
>    from pyanaconda.flags import flags
>    (opts, args, depr) = parseOptions(cmdline=flags.cmdline)

[PATCH 2/4] Collect addon paths properly

[Martin Sivak]

---
 anaconda                | 3 ++-
 pyanaconda/kickstart.py | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/anaconda b/anaconda
index cc02a5c..17bf3af 100755
--- a/anaconda
+++ b/anaconda
@@ -829,7 +829,8 @@ if __name__ == "__main__":
         break

if not ksdata:
-        ksdata = kickstart.AnacondaKSHandler(constants.ADDON_PATHS)
+        addon_paths = collect_addon_paths(constants.ADDON_PATHS)
+        ksdata = kickstart.AnacondaKSHandler(addon_paths["ks"])

if ksdata.rescue.rescue:
         anaconda.rescue = True
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 0e44eee..65a1e55 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -53,7 +53,7 @@ from pyanaconda.simpleconfig import SimpleConfigFile
 from pyanaconda.users import getPassAlgo
 from pyanaconda.desktop import Desktop
 from .ui.common import collect
-from .addons import AddonSection, AddonData, AddonRegistry
+from .addons import AddonSection, AddonData, AddonRegistry, collect_addon_paths

from pykickstart.base import KickstartCommand
 from pykickstart.constants import *
@@ -1438,7 +1438,8 @@ def preScriptPass(f):
 def parseKickstart(f):
     # preprocessing the kickstart file has already been handled in initramfs.

-    handler = AnacondaKSHandler(ADDON_PATHS)
+    addon_paths = collect_addon_paths(ADDON_PATHS)
+    handler = AnacondaKSHandler(addon_paths["ks"])
     ksparser = AnacondaKSParser(handler)

# We need this so all the /dev/disk/* stuff is set up before parsing.

[PATCH 3/4] Fix typo in variable name

[Martin Sivak]

---
 pyanaconda/ui/gui/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py
index aec6db9..02ebb63 100644
--- a/pyanaconda/ui/gui/__init__.py
+++ b/pyanaconda/ui/gui/__init__.py
@@ -329,7 +329,7 @@ class GraphicalUserInterface(UserInterface):

self._currentAction.refresh()

-        self._currentAction.window.set_beta(not self._isFinal())
+        self._currentAction.window.set_beta(not self._isFinal)
         self._currentAction.window.set_property("distribution", self._distributionText().upper())

# Set fonts app-wide, where possible

[PATCH 4/4] Sort categories in GUI alphabetically

[Martin Sivak]

---
 pyanaconda/ui/gui/hubs/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyanaconda/ui/gui/hubs/__init__.py b/pyanaconda/ui/gui/hubs/__init__.py
index 592e812..3975b37 100644
--- a/pyanaconda/ui/gui/hubs/__init__.py
+++ b/pyanaconda/ui/gui/hubs/__init__.py
@@ -142,7 +142,7 @@ class Hub(GUIObject, common.Hub):

box = Gtk.VBox(False, 6)

-        for c in categories:
+        for c in sorted(categories, key=lambda c: c.title):
             obj = c()

selectors = []

[Vratislav Podzimek]

On Tue, 2012-12-18 at 14:37 +0100, Martin Sivak wrote:
> This fixes broken updates= and some other failures we found out while
> working with the branch today.

Apart from one minor comment, this looks good to me.