summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2006-04-12 20:43:26 +0000
committerChris Lumens <clumens@redhat.com>2006-04-12 20:43:26 +0000
commit8ca082617a5b34388fb58e6c0b45d513344c49c8 (patch)
tree9f7235735c0568fa1ddb8072bca7ef62b0e7fc47
parent3c045951556d45e82528af6fd246a3fb857b7d54 (diff)
downloadanaconda-8ca082617a5b34388fb58e6c0b45d513344c49c8.tar.gz
anaconda-8ca082617a5b34388fb58e6c0b45d513344c49c8.tar.xz
anaconda-8ca082617a5b34388fb58e6c0b45d513344c49c8.zip
Fix handling of method for ftp.
-rw-r--r--ChangeLog4
-rwxr-xr-xanaconda6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index bde76dc49..4a873ee2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-12 Chris Lumens <clumens@redhat.com>
+
+ * anaconda: Fix handling of method for ftp.
+
2006-04-12 Paul Nasrat <pnasrat@redhat.com>
* yuminstall.py: Don't download things twice (183654)
diff --git a/anaconda b/anaconda
index 956df3ed8..1c8e55133 100755
--- a/anaconda
+++ b/anaconda
@@ -526,9 +526,9 @@ if opts.syslog:
if opts.method and opts.method[0] == '@':
# ftp installs pass the password via a file in /tmp so
# ps doesn't show it
- filename = method[1:]
- method = open(filename, "r").readline()
- opts.method = method[:len(method) - 1]
+ filename = opts.method[1:]
+ opts.method = open(filename, "r").readline()
+ opts.method = opts.method[:len(opts.method) - 1]
os.unlink(filename)
if opts.module: