<div dir="ltr">Also pushed to release24 branch, if you are willing to test this that would be great.<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Aug 22, 2014 at 7:24 AM, Jörgen Maas <span dir="ltr"><<a href="mailto:jorgen.maas@gmail.com" target="_blank">jorgen.maas@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div>Of course, another error when backporting stuff.<br></div>This should fix that.<br><br>diff --git a/cobbler.spec b/cobbler.spec<br>
index 367dd05..03249bd 100644<br>--- a/cobbler.spec<br>+++ b/cobbler.spec<br>
@@ -17,7 +17,6 @@ Url: <a href="http://www.cobblerd.org/" target="_blank">http://www.cobblerd.org/</a><br> <br> BuildRequires: redhat-rpm-config<br> BuildRequires: git<br>-BuildRequires: PyYAML<br> BuildRequires: python-cheetah<br>
BuildRequires: python-setuptools<br>
<br>diff --git a/cobbler/api.py b/cobbler/api.py<br>index aa4d2ee..00f0e3c 100644<br>--- a/cobbler/api.py<br>+++ b/cobbler/api.py<br>@@ -23,9 +23,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA<br> """<br>
<br> import sys<br>-import yaml<br> import config<br> import utils<br>+from ConfigParser import ConfigParser<br>+<br> import action_sync<br> import action_check<br> import action_reposync<br>@@ -207,7 +208,7 @@ class BootAPI:<br>
if debug:<br> logger = self.logger.debug<br> else:<br>- logger = <a href="http://self.logger.info" target="_blank">self.logger.info</a> <br>+ logger = <a href="http://self.logger.info" target="_blank">self.logger.info</a><br>
if args is None:<br> logger("%s" % msg)<br> else:<br>@@ -220,7 +221,7 @@ class BootAPI:<br> What version is cobbler?<br> <br> If extended == False, returns a float for backwards compatibility<br>
- <br>+<br> If extended == True, returns a dict:<br> <br> gitstamp -- the last git commit hash<br>@@ -229,13 +230,22 @@ class BootAPI:<br> version -- something like "1.3.2"<br>
version_tuple -- something like [ 1, 3, 2 ]<br> """<br>- fd = open("/etc/cobbler/version")<br>- ydata = fd.read()<br>- fd.close()<br>- data = yaml.safe_load(ydata)<div class="">
<br>
+<br>+ config = ConfigParser()<br></div>+ config.read("/etc/cobbler/version")<br>+ data = {}<br>+ data["gitdate"] = config.get("cobbler","gitdate")<br>+ data["gitstamp"] = config.get("cobbler","gitstamp")<br>
+ data["builddate"] = config.get("cobbler","builddate")<br>+ data["version"] = config.get("cobbler","version")<br>+ # dont actually read the version_tuple from the version file<br>
+ data["version_tuple"] = []<br>+ for num in data["version"].split("."):<br>+ data["version_tuple"].append(int(num))<br>+<br> if not extended:<br> # for backwards compatibility and use with koan's comparisons<br>
- elems = data["version_tuple"] <br>+ elems = data["version_tuple"]<br> return int(elems[0]) + 0.1*int(elems[1]) + 0.001*int(elems[2])<br> else:<br> return data<br>
<br></div><div class="gmail_extra"><div><div class="h5"><br><br><div class="gmail_quote">On Fri, Aug 22, 2014 at 12:33 AM, Orion Poplawski <span dir="ltr"><<a href="mailto:orion@cora.nwra.com" target="_blank">orion@cora.nwra.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">But the method of creation changed between 2.4.6 and 2.4.7 with:<br>
<br>
commit f78979a8463e5519c21ea40dfebc43<u></u>8ff3c07b99<br>
Author: Jörgen Maas <<a href="mailto:jorgen.maas@gmail.com" target="_blank">jorgen.maas@gmail.com</a>><br>
Date: Fri Jul 25 09:47:58 2014 +0200<br>
<br>
Fix broken gitdate, gitstamp values in version file.<br>
<br>
diff --git a/setup.py b/setup.py<br>
index 970b4f9..dd5bd46 100644<br>
--- a/setup.py<br>
+++ b/setup.py<br>
@@ -1,5 +1,6 @@<br>
#!/usr/bin/env python<br>
-import glob, os, sys, time, yaml<br>
+import glob, os, sys, time<br>
+from ConfigParser import ConfigParser<br>
from distutils.core import setup, Command<br>
from distutils.command.build_py import build_py as _build_py<br>
import unittest<br>
@@ -77,24 +78,24 @@ def gen_manpages():<br>
##############################<u></u>##############################<u></u>#########<br>
<br>
def gen_build_version():<br>
- fd = open(os.path.join(OUTPUT_DIR, "version"),"w+")<br>
- gitdate = "?"<br>
- gitstamp = "?"<br>
builddate = time.asctime()<br>
- if os.path.exists(".git"):<br>
- # for builds coming from git, include the date of the last commit<br>
- cmd = subprocess.Popen(["/usr/bin/<u></u>git","log","--format=%h%n%ad",<u></u>"-1"],stdout=subprocess.<br>
- data = cmd.communicate()[0].strip()<br>
- if cmd.returncode == 0:<br>
- gitstamp, gitdate = data.split("\n")<br>
- data = {<br>
- "gitdate" : gitdate,<br>
- "gitstamp" : gitstamp,<br>
- "builddate" : builddate,<br>
- "version" : VERSION,<br>
- "version_tuple" : [ int(x) for x in VERSION.split(".")]<br>
- }<br>
- fd.write(yaml.dump(data))<br>
+ cmd = subprocess.Popen(["/usr/bin/<u></u>git", "log", "--format=%h%n%ad", "-1"], stdout=subprocess<br>
+ data = cmd.communicate()[0].strip()<br>
+ if cmd.returncode == 0:<br>
+ gitstamp, gitdate = data.split("\n")<br>
+ else:<br>
+ gitdate = "?"<br>
+ gitstamp = "?"<br>
+<br>
+ fd = open(os.path.join(OUTPUT_DIR, "version"), "w+")<br>
+ config = ConfigParser()<br>
+ config.add_section("cobbler")<br>
+ config.set("cobbler","gitdate"<u></u>, gitdate)<br>
+ config.set("cobbler","<u></u>gitstamp", gitstamp)<br>
+ config.set("cobbler","<u></u>builddate", builddate)<br>
+ config.set("cobbler","version"<u></u>, VERSION)<br>
+ config.set("cobbler","version_<u></u>tuple", [ int(x) for x in VERSION.split(".")])<br>
+ config.write(fd)<br>
fd.close()<br>
<br>
##############################<u></u>##############################<u></u>#########<div><br>
<br>
<br>
<br>
On 08/18/2014 02:41 PM, Jörgen Maas wrote:<br>
</div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div>
Not very likely, the file is generated by setup.py when building/installing.<br>
<br>
<br>
<br>
On Mon, Aug 18, 2014 at 10:11 PM, Greg Chavez <<a href="mailto:greg.chavez@gmail.com" target="_blank">greg.chavez@gmail.com</a><br></div><div>
<mailto:<a href="mailto:greg.chavez@gmail.com" target="_blank">greg.chavez@gmail.com</a>><u></u>> wrote:<br>
<br>
I pulled down a backup of the version file from a few days ago and solved<br>
the issue:<br>
<br>
root@io-ns-03:~> cat /etc/cobbler/version<br>
builddate: Tue Apr 22 15:30:11 2014<br>
gitdate: '?'<br>
gitstamp: '?'<br>
version: 2.4.4<br>
version_tuple: [2, 4, 4]<br>
<br>
So like the 2.6 version file snuck into the 2.4.7 package?<br>
<br>
<br>
On Mon, Aug 18, 2014 at 3:56 PM, Jörgen Maas <<a href="mailto:jorgen.maas@gmail.com" target="_blank">jorgen.maas@gmail.com</a><br></div><div>
<mailto:<a href="mailto:jorgen.maas@gmail.com" target="_blank">jorgen.maas@gmail.com</a>><u></u>> wrote:<br>
<br>
The format of the version file changed in 2.6.x (it's now basically<br>
ini format using python ConfigParser)<br>
<br>
<br>
On Mon, Aug 18, 2014 at 5:14 PM, Greg Chavez <<a href="mailto:greg.chavez@gmail.com" target="_blank">greg.chavez@gmail.com</a><br></div><div>
<mailto:<a href="mailto:greg.chavez@gmail.com" target="_blank">greg.chavez@gmail.com</a>><u></u>> wrote:<br>
<br>
Thanks for your reply, Alan.<br>
<br>
I didn't do a find/xargs/grep for version_tuple! Drat, bad<br>
troubleshooting. But in any case, even converting that file to<br>
YAML doesn't seem to help, I just get more errors.<br>
<br>
Another interesting thing, the format of /etc/cobbler/version in<br>
2.6.3 is not in YAML either.<br>
<br>
Whatever. This is only affecting the Web console, so I can stay in<br>
business while I stand up 2.6 on a new server and replicate.<br>
<br>
--Greg<br>
<br>
<br>
On Mon, Aug 18, 2014 at 10:49 AM, Alan Evangelista<br></div><div><div>
<<a href="mailto:alanoe@linux.vnet.ibm.com" target="_blank">alanoe@linux.vnet.ibm.com</a> <mailto:<a href="mailto:alanoe@linux.vnet.ibm.com" target="_blank">alanoe@linux.vnet.ibm.<u></u>com</a>>> wrote:<br>
<br>
On 08/18/2014 11:27 AM, Greg Chavez wrote:<br>
<br>
So I upgraded the cobbler and cobbler-web yum packages<br>
from 2.4.4 to 2.4.7, in preparation for upgrading to 2.6<br>
(this is a RedHat 5.6 system). Cobbler works fine from<br>
the command line, but I get an error when I attempt to<br>
login to the Web console. In /var/log/cobbler, I get this<br>
every time I access:<br>
<br>
<br>
Fri Aug 15 14:59:08 2014 - INFO | Exception occured:<br>
yaml.parser.ParserError<br>
Fri Aug 15 14:59:08 2014 - INFO | Exception value:<br>
expected<br>
'<document start>', but found '<scalar>'<br>
in "<string>", line 2, column 1:<br>
version_tuple = [2, 4, 7]<br>
^<br>
<br>
<br>
/etc/cobbler/version has incorrect format, it should be in<br>
YAML.. Example:<br>
<br>
builddate: Thu Jan 30 21:42:10 2014<br>
gitdate: Mon Dec 9 11:08:16 2013 -0800<br>
gitstamp: 2181fa3<br>
version: 2.5.0<br>
version_tuple: [2, 5, 0]<br>
<br>
It is possible you'll have conflicts with other files. I'd<br>
recommend backing up important data and making a a clean<br>
installation.<br>
<br>
<br>
Regards,<br>
Alan Evangelista<br>
<br></div></div>
______________________________<u></u>___________________<br>
cobbler mailing list<br>
<a href="mailto:cobbler@lists.fedorahosted.org" target="_blank">cobbler@lists.fedorahosted.org</a><br>
<mailto:<a href="mailto:cobbler@lists.fedorahosted.org" target="_blank">cobbler@lists.<u></u>fedorahosted.org</a>><br>
<a href="https://lists.fedorahosted." target="_blank">https://lists.fedorahosted.</a>__<u></u>org/mailman/listinfo/cobbler<div><br>
<<a href="https://lists.fedorahosted.org/mailman/listinfo/cobbler" target="_blank">https://lists.fedorahosted.<u></u>org/mailman/listinfo/cobbler</a>><br>
<br>
<br>
<br>
<br>
--<br>
\*..+.-<br>
--Greg Chavez<br>
+//..;};<br>
<br>
______________________________<u></u>_________________<br>
cobbler mailing list<br></div>
<a href="mailto:cobbler@lists.fedorahosted.org" target="_blank">cobbler@lists.fedorahosted.org</a> <mailto:<a href="mailto:cobbler@lists.fedorahosted.org" target="_blank">cobbler@lists.<u></u>fedorahosted.org</a>><div>
<br>
<a href="https://lists.fedorahosted.org/mailman/listinfo/cobbler" target="_blank">https://lists.fedorahosted.<u></u>org/mailman/listinfo/cobbler</a><br>
<br>
<br>
<br>
<br>
--<br>
Grtz,<br>
Jörgen Maas<br>
<br>
______________________________<u></u>_________________<br>
cobbler mailing list<br></div>
<a href="mailto:cobbler@lists.fedorahosted.org" target="_blank">cobbler@lists.fedorahosted.org</a> <mailto:<a href="mailto:cobbler@lists.fedorahosted.org" target="_blank">cobbler@lists.<u></u>fedorahosted.org</a>><div>
<br>
<a href="https://lists.fedorahosted.org/mailman/listinfo/cobbler" target="_blank">https://lists.fedorahosted.<u></u>org/mailman/listinfo/cobbler</a><br>
<br>
<br>
<br>
<br>
--<br>
\*..+.-<br>
--Greg Chavez<br>
+//..;};<br>
<br>
______________________________<u></u>_________________<br>
cobbler mailing list<br></div>
<a href="mailto:cobbler@lists.fedorahosted.org" target="_blank">cobbler@lists.fedorahosted.org</a> <mailto:<a href="mailto:cobbler@lists.fedorahosted.org" target="_blank">cobbler@lists.<u></u>fedorahosted.org</a>><div>
<br>
<a href="https://lists.fedorahosted.org/mailman/listinfo/cobbler" target="_blank">https://lists.fedorahosted.<u></u>org/mailman/listinfo/cobbler</a><br>
<br>
<br>
<br>
<br>
--<br>
Grtz,<br>
Jörgen Maas<br>
<br>
<br>
______________________________<u></u>_________________<br>
cobbler mailing list<br>
<a href="mailto:cobbler@lists.fedorahosted.org" target="_blank">cobbler@lists.fedorahosted.org</a><br>
<a href="https://lists.fedorahosted.org/mailman/listinfo/cobbler" target="_blank">https://lists.fedorahosted.<u></u>org/mailman/listinfo/cobbler</a><br>
<br>
</div></blockquote><span><font color="#888888">
<br>
<br>
-- <br>
Orion Poplawski<br>
Technical Manager 303-415-9701 x222<br>
NWRA, Boulder/CoRA Office FAX: 303-415-9702<br>
3380 Mitchell Lane <a href="mailto:orion@nwra.com" target="_blank">orion@nwra.com</a><br>
Boulder, CO 80301 <a href="http://www.nwra.com" target="_blank">http://www.nwra.com</a></font></span><div><div><br>
______________________________<u></u>_________________<br>
cobbler mailing list<br>
<a href="mailto:cobbler@lists.fedorahosted.org" target="_blank">cobbler@lists.fedorahosted.org</a><br>
<a href="https://lists.fedorahosted.org/mailman/listinfo/cobbler" target="_blank">https://lists.fedorahosted.<u></u>org/mailman/listinfo/cobbler</a><br>
</div></div></blockquote></div><br><br clear="all"><br></div></div><span class="HOEnZb"><font color="#888888">-- <br>Grtz,<br>Jörgen Maas
</font></span></div>
</blockquote></div><br><br clear="all"><br>-- <br>Grtz,<br>Jörgen Maas
</div>