[PATCH] Fix typo in action_reposync.py self.settings call and change http_port to "str"

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is my first patch generated with git, so hopefully I've done this correctly.

I installed Cobbler 0.8 today and noticed that one of my repos which is defined as an existing yum repository (http://) generated an error. This patch fixes the typo which caused the error and changed the default http_port setting to be a string instead of an integer - hopefully that doesn't break something else.

Thanks,

-- jeremy


---
 cobbler/action_reposync.py |    2 +-
 cobbler/settings.py        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cobbler/action_reposync.py b/cobbler/action_reposync.py
index 06340aa..6e62489 100644
--- a/cobbler/action_reposync.py
+++ b/cobbler/action_reposync.py
@@ -244,7 +244,7 @@ class RepoSync:
                 config_file.write("%s=%s\n" % (x, repo.yumopts[x]))
         else:
             line = "baseurl=%s\n" % repo.mirror
- http_server = self.setting.server + ":" + self.settings.http_port + http_server = self.settings.server + ":" + self.settings.http_port
             line = line.replace("@@server@@",http_server)
             config_file.write(line)
         config_file.write("enabled=1\n")
diff --git a/cobbler/settings.py b/cobbler/settings.py
index 86a24af..8cd7032 100644
--- a/cobbler/settings.py
+++ b/cobbler/settings.py
@@ -36,7 +36,7 @@ DEFAULTS = {
     "dnsmasq_bin"                 : "/usr/sbin/dnsmasq",
     "dnsmasq_conf"                : "/etc/dnsmasq.conf",
     "httpd_bin"                   : "/usr/sbin/httpd",
-    "http_port"                   : 80,
+    "http_port"                   : "80",
     "kerberos_realm"              : "example.org",
     "kernel_options"              : {
         "lang"                    : " ",
--
1.5.4

_______________________________________________
et-mgmt-tools mailing list
et-mgmt-tools@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/et-mgmt-tools

[Index of Archives]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux