summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2005-08-17 15:07:04 +0000
committerChris Lumens <clumens@redhat.com>2005-08-17 15:07:04 +0000
commitb9320b2d7bc167006e562c3c768e5cf940ae5c28 (patch)
tree5eb5d579cd3f50afc2eb732b85863d780a676814
parent9e6599179969a4588c8f5e4107270e0c155f1753 (diff)
downloadanaconda-b9320b2d7bc167006e562c3c768e5cf940ae5c28.tar.gz
anaconda-b9320b2d7bc167006e562c3c768e5cf940ae5c28.tar.xz
anaconda-b9320b2d7bc167006e562c3c768e5cf940ae5c28.zip
We've been silently ignoring on the mouse keyword for a while now. Time to
be more noisy about it so people will correct their files.
-rw-r--r--ChangeLog5
-rw-r--r--docs/kickstart-docs.txt8
-rw-r--r--kickstart.py24
3 files changed, 11 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index 74a288d7a..b2291b19f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-17 Chris Lumens <clumens@redhat.com>
+
+ * kickstart.py (Kickstart.doMouse): Don't silently fail anymore.
+ * docs/kickstart-docs.txt: Document change.
+
2005-08-16 Jeremy Katz <katzj@redhat.com>
* scripts/upd-instroot (KEEPFILE): Fix paths to some python stuff
diff --git a/docs/kickstart-docs.txt b/docs/kickstart-docs.txt
index a05c0df34..09d9239f8 100644
--- a/docs/kickstart-docs.txt
+++ b/docs/kickstart-docs.txt
@@ -623,7 +623,7 @@ Creating the Kickstart File
error message to be printed to the screen and installation to halt.
Instead of using the langsupport keyword, you should now list the
support package groups for all languages you want supported in the
- %packages section of your kickstart file. Fr instance, adding
+ %packages section of your kickstart file. For instance, adding
support for French means you should add the following to %packages:
@french-support
@@ -692,8 +692,10 @@ Creating the Kickstart File
mouse
- The mouse configuration option is deprecated. It is still
- recognized for backwards compatibility, but has no effects.
+ The mouse keywork is deprecated and its use will cause an error
+ message to be printed to the screen and installation to halt. This
+ keyword has been deprecated for some time now but has been silently
+ ignored.
network (optional)
diff --git a/kickstart.py b/kickstart.py
index 16725e19e..569efeddb 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -589,28 +589,7 @@ class Kickstart(BaseInstallClass):
self.setZeroMbr(id, 1)
def doMouse(self, id, args):
- #Don't do anything with mice anymore
- return
-
-## (args, extra) = isys.getopt(args, '', [ 'device=', 'emulthree' ])
-## mouseType = "none"
-## device = None
-## emulThree = 0
-
-## for n in args:
-## (str, arg) = n
-## if str == "--device":
-## device = arg
-## elif str == "--emulthree":
-## emulThree = 1
-
-## if extra:
-## mouseType = extra[0]
-
-## if mouseType != "none":
-## self.setMouse(id, mouseType, device, emulThree)
-
-## self.skipSteps.append("mouse")
+ raise KickstartError, "The mouse keyword has not been functional for several releases and has now been removed. Please modify your kickstart file by removing this keyword."
def doReboot(self, id, args):
self.skipSteps.append("complete")
@@ -1370,7 +1349,6 @@ class Kickstart(BaseInstallClass):
dispatch.skipStep("findinstall", permanent = 1)
dispatch.skipStep("language")
dispatch.skipStep("keyboard")
-# dispatch.skipStep("mouse")
dispatch.skipStep("welcome")
dispatch.skipStep("betanag")
dispatch.skipStep("installtype")