rpms/blogtk/devel blogtk-1.1-configname.patch, NONE, 1.1 blogtk.spec, 1.9, 1.10
Paul W. Frields
pfrields at fedoraproject.org
Sun Jul 26 18:24:32 UTC 2009
Author: pfrields
Update of /cvs/pkgs/rpms/blogtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25076
Modified Files:
blogtk.spec
Added Files:
blogtk-1.1-configname.patch
Log Message:
Patch erroneous config parsing for Python 2.6 (#501183)
blogtk-1.1-configname.patch:
BloGTK.py | 27 ++++++++++++++-------------
config.py | 41 +++++++++++++++++++++--------------------
2 files changed, 35 insertions(+), 33 deletions(-)
--- NEW FILE blogtk-1.1-configname.patch ---
diff -uNr BloGTK-1.1/src/BloGTK.py BloGTK-1.1-new/src/BloGTK.py
--- BloGTK-1.1/src/BloGTK.py 2005-01-09 22:51:05.000000000 -0500
+++ BloGTK-1.1-new/src/BloGTK.py 2009-07-26 14:20:47.523561652 -0400
@@ -317,7 +317,7 @@
self.blogNameLabel = self.mainGlade.get_widget('blogNameLabel')
if self.blogNameLabel.get_text() == "":
- self.blogNameLabel.set_text("Default")
+ self.blogNameLabel.set_text("DefaultBlog")
else:
pass
@@ -333,7 +333,8 @@
for item in self.sections:
if item == "server":
- self.conf.add_section("Default")
+ #if not self.conf.has_section("DefaultBlog"):
+ # self.conf.add_section("DefaultBlog")
self.url = self.conf.get("server", "server")
self.user = self.conf.get("server", "user")
self.passwd = self.conf.get("server", "pass")
@@ -345,11 +346,11 @@
except ConfigParser.NoOptionError, error:
self.font = "Sans 12"
- self.conf.set("Default", "server", self.url)
- self.conf.set("Default", "user", self.user)
- self.conf.set("Default", "pass", self.passwd)
- self.conf.set("Default", "system", self.system)
- self.conf.set("Default", "font", self.font)
+ self.conf.set("DefaultBlog", "server", self.url)
+ self.conf.set("DefaultBlog", "user", self.user)
+ self.conf.set("DefaultBlog", "pass", self.passwd)
+ self.conf.set("DefaultBlog", "system", self.system)
+ self.conf.set("DefaultBlog", "font", self.font)
self.conf.remove_option("server", "server")
self.conf.remove_option("server", "user")
@@ -399,9 +400,9 @@
# set yet. Therefore we'll now have to set them to their default values.
try:
- self.useUTF = self.conf.get("Default", "useUTF")
- self.defaultPublish = self.conf.get("Default", "defaultPublish")
- self.retrievalNumber = self.conf.get("Default", "retrievalNumber")
+ self.useUTF = self.conf.get("default", "useUTF")
+ self.defaultPublish = self.conf.get("default", "defaultPublish")
+ self.retrievalNumber = self.conf.get("default", "retrievalNumber")
if self.defaultPublish == "1":
self.publishCheck.set_active(gtk.TRUE)
@@ -412,9 +413,9 @@
print "Creating general settings configuration..."
- self.conf.set("Default", "useUTF", "0")
- self.conf.set("Default", "defaultPublish", "0")
- self.conf.set("Default", "retrievalNumber", "10")
+ self.conf.set("DefaultBlog", "useUTF", "0")
+ self.conf.set("DefaultBlog", "defaultPublish", "0")
+ self.conf.set("DefaultBlog", "retrievalNumber", "10")
conf_file = open(self.configDir + "/BloGTK.conf", 'w+')
self.conf.write(conf_file)
conf_file.close()
diff -uNr BloGTK-1.1/src/config.py BloGTK-1.1-new/src/config.py
--- BloGTK-1.1/src/config.py 2004-04-16 12:04:42.000000000 -0400
+++ BloGTK-1.1-new/src/config.py 2009-07-26 14:17:31.479437084 -0400
@@ -87,18 +87,19 @@
self.parser = ConfigParser.ConfigParser()
self.file = open(self.configFile, "w")
- self.parser.add_section("Default")
- self.parser.write(self.file)
-
- self.parser.set("Default", "server", "http://www.yoursite.com/blog/blog.cgi")
- self.parser.set("Default", "user", "username")
- self.parser.set("Default", "pass", "password")
- self.parser.set("Default", "system", "blogger")
- self.parser.set("Default", "font", "Sans 12")
+ if not self.parser.has_section("DefaultBlog"):
+ self.parser.add_section("DefaultBlog")
+ #self.parser.write(self.file)
+
+ self.parser.set("DefaultBlog", "server", "http://www.yoursite.com/blog/blog.cgi")
+ self.parser.set("DefaultBlog", "user", "username")
+ self.parser.set("DefaultBlog", "pass", "password")
+ self.parser.set("DefaultBlog", "system", "blogger")
+ self.parser.set("DefaultBlog", "font", "Sans 12")
- self.parser.set("Default", "Publish", "FALSE")
- self.parser.set("Default", "useUTF", "0")
- self.parser.set("Default", "retrievalNumber", "10")
+ self.parser.set("DefaultBlog", "Publish", "FALSE")
+ self.parser.set("DefaultBlog", "useUTF", "0")
+ self.parser.set("DefaultBlog", "retrievalNumber", "10")
self.parser.write(self.file)
self.blogs = self.parser.sections()
@@ -171,9 +172,9 @@
self.system = self.parser.get(self.section, "system")
# 0.9 - We need to pull our General Settings from the config as well...
- self.defaultPublish = self.parser.get("Default", "defaultPublish")
- self.useUTF = self.parser.get("Default", "useutf")
- self.retrievalNumber = self.parser.get("Default", "retrievalNumber")
+ self.defaultPublish = self.parser.get("blogtk", "defaultPublish")
+ self.useUTF = self.parser.get("blogtk", "useutf")
+ self.retrievalNumber = self.parser.get("blogtk", "retrievalNumber")
except ConfigParser.NoSectionError:
pass
@@ -291,22 +292,22 @@
# 0.9 - Each time we save the form, we want to also save our general settings as well...
if self.defaultPublishCheck.get_active() == gtk.TRUE:
- self.parser.set("Default", "defaultPublish", "1")
+ self.parser.set("blogtk", "defaultPublish", "1")
self.defaultMainCheck.set_active(gtk.TRUE)
else:
- self.parser.set("Default", "defaultPublish", "0")
+ self.parser.set("blogtk", "defaultPublish", "0")
self.defaultMainCheck.set_active(gtk.FALSE)
if self.useUTF8Check.get_active() == gtk.TRUE:
- self.parser.set("Default", "useUTF", "1")
+ self.parser.set("blogtk", "useUTF", "1")
else:
- self.parser.set("Default", "useUTF", "0")
+ self.parser.set("blogtk", "useUTF", "0")
number = self.retrievalSpin.get_value()
num_string = str(number)
- self.parser.set("Default", "retrievalNumber", num_string)
+ self.parser.set("blogtk", "retrievalNumber", num_string)
self.writeFile = open(self.configFile, "w")
self.parser.write(self.writeFile)
@@ -324,7 +325,7 @@
self.section = self.accountsCombo.entry.get_text()
- if self.section == "Default":
+ if self.section == "DefaultBlog":
errDialog = gtk.Dialog(title="Error", parent=self.accountsWindow, flags=0)
button2 = gtk.Button(stock=gtk.STOCK_OK)
button2.connect_object("clicked", gtk.Widget.destroy, errDialog)
Index: blogtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blogtk/devel/blogtk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- blogtk.spec 24 Jul 2009 18:12:00 -0000 1.9
+++ blogtk.spec 26 Jul 2009 18:24:32 -0000 1.10
@@ -11,6 +11,7 @@ License: BSD
URL: http://blogtk.sourceforge.net
Source0: http://dl.sf.net/blogtk/blogtk_%{version}.tar.bz2
Source1: BSD
+Patch0: blogtk-1.1-configname.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -33,6 +34,7 @@ weblog with XML-RPC and create new posts
%prep
%setup -q -n BloGTK-%{version}
cp %{SOURCE1} $RPM_BUILD_DIR/BloGTK-%{version}
+%patch0 -p1 -b .configname
%build
@@ -87,8 +89,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sun Jul 26 2009 Paul W. Frields <stickster at gmail.com> - 1.1-12
+- Fix config file naming (#501183)
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the fedora-extras-commits
mailing list