---
anaconda | 36 ------------------------------------
loader/loader.c | 9 +--------
loader/loader.h | 1 -
pyanaconda/gui.py | 4 ----
4 files changed, 1 insertions(+), 49 deletions(-)
diff --git a/anaconda b/anaconda
index 8b577f3..a3a1172 100755
--- a/anaconda
+++ b/anaconda
@@ -216,7 +216,6 @@ def parseOptions(argv = None):
op.add_option("--module", action="append", default=[])
op.add_option("--nomount", dest="rescue_nomount", action="store_true", default=False)
op.add_option("--updates", dest="updateSrc", action="store", type="string")
- op.add_option("--dogtail", dest="dogtail", action="store", type="string")
op.add_option("--dlabel", action="store_true", default=False)
op.add_option("--image", action="append", dest="images", default=[])
@@ -537,37 +536,6 @@ def setupDisplay(anaconda, opts):
anaconda.initInterface()
anaconda.instClass.configure(anaconda)
-def runDogtail(opts):
- import urlgrabber
-
- try:
- fr = urlgrabber.urlopen(opts.dogtail)
- except urlgrabber.grabber.URLGrabError as e:
- log.error("Could not retrieve Dogtail script from %s.\nError "
- "was\n%s" % (opts.dogtail, e))
- return
-
- (fw, testcase) = mkstemp(prefix='testcase.py.', dir='/tmp')
- os.write(fw, fr.read())
- fr.close()
- os.close(fw)
-
- try:
- # download completed, run the test
- if not os.fork():
- # we are in the child
- os.chmod(testcase, 0755)
- os.execv(testcase, [testcase])
- sys.exit(0)
- else:
- # we are in the parent, sleep to give time for the testcase
- # to initialize
- # todo: is this needed, how to avoid possible race conditions
- time.sleep(1)
- except OSError as e:
- log.error("Exception %s while running Dogtail testcase" % e)
-
-
if __name__ == "__main__":
setupPythonPath()
@@ -780,10 +748,6 @@ if __name__ == "__main__":
# add our own additional signal handlers
signal.signal(signal.SIGUSR2, lambda signum, frame: anaconda.dumpState())
- # download and run Dogtail script
- if opts.dogtail:
- runDogtail(opts)
-
if opts.lang:
# this is lame, but make things match what we expect (#443408)
opts.lang = opts.lang.replace(".utf8", ".UTF-8")
diff --git a/loader/loader.c b/loader/loader.c
index 374ab63..90f1ce6 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -938,9 +938,7 @@ static void parseCmdLineFlags(struct loaderData_s * loaderData) {
/* boot arguments that are of the form name=value */
/* all arguments in this block require the value */
- if (!strcasecmp(k, "dogtail")) {
- loaderData->dogtailurl = g_strdup(v);
- } else if (!strcasecmp(k, "dlabel")) {
+ if (!strcasecmp(k, "dlabel")) {
if (!strcasecmp(v, "on")) {
flags |= LOADER_FLAGS_AUTOMODDISK;
} else if (!strcasecmp(v, "off")) {
@@ -2345,11 +2343,6 @@ int main(int argc, char ** argv) {
*argptr++ = loaderData.updatessrc;
}
- if (loaderData.dogtailurl) {
- *argptr++ = "--dogtail";
- *argptr++ = loaderData.dogtailurl;
- }
-
if ((loaderData.lang) && !FL_NOPASS(flags)) {
*argptr++ = "--lang";
*argptr++ = loaderData.lang;
diff --git a/loader/loader.h b/loader/loader.h
index b81fc40..68b03f6 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -148,7 +148,6 @@ struct loaderData_s {
char * ddsrc;
char * logLevel;
char * updatessrc;
- char * dogtailurl;
char * gdbServer;
char * instRepo;
int instRepo_noverifyssl;
diff --git a/pyanaconda/gui.py b/pyanaconda/gui.py
index bf2fa52..74d44ba 100755
--- a/pyanaconda/gui.py
+++ b/pyanaconda/gui.py
@@ -25,10 +25,6 @@ import os
from flags import flags
os.environ["GNOME_DISABLE_CRASH_DIALOG"] = "1"
-# we only want to enable the accessibility stuff if requested for now...
-if flags.cmdline.has_key("dogtail"):
- os.environ["GTK_MODULES"] = "gail:atk-bridge"
-
import string
import time
import traceback
--
1.7.6
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
