rpms/TurboGears/F-11 TurboGears.spec, 1.48, 1.49 turbogears-sqlcreate.patch, 1.2, 1.3
Toshio くらとみ
toshio at fedoraproject.org
Thu Dec 17 23:05:38 UTC 2009
Author: toshio
Update of /cvs/pkgs/rpms/TurboGears/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14159/F-11
Modified Files:
TurboGears.spec turbogears-sqlcreate.patch
Log Message:
* Thu Dec 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-2
- Update sql create patch for traceback when used in development mode RHBZ#548594
Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-11/TurboGears.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- TurboGears.spec 1 Dec 2009 15:55:53 -0000 1.48
+++ TurboGears.spec 17 Dec 2009 23:05:38 -0000 1.49
@@ -3,7 +3,7 @@
Name: TurboGears
Version: 1.0.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Back-to-front web development in Python
Group: Development/Languages
@@ -98,6 +98,9 @@ rm -rf %{buildroot}
%{python_sitelib}/turbogears/
%changelog
+* Thu Dec 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-2
+- Update sql create patch for traceback when used in development mode RHBZ#548594
+
* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-1
- Update to 1.0.9 bugfix release.
- Paginate fix is in upstream.
turbogears-sqlcreate.patch:
base.py | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
Index: turbogears-sqlcreate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-11/turbogears-sqlcreate.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- turbogears-sqlcreate.patch 1 Dec 2009 15:55:53 -0000 1.2
+++ turbogears-sqlcreate.patch 17 Dec 2009 23:05:38 -0000 1.3
@@ -2,15 +2,20 @@ Index: TurboGears-1.0.9/turbogears/comma
===================================================================
--- TurboGears-1.0.9.orig/turbogears/command/base.py
+++ TurboGears-1.0.9/turbogears/command/base.py
-@@ -127,11 +127,15 @@ class SQL(CommandWithDB):
+@@ -127,11 +127,20 @@ class SQL(CommandWithDB):
if not eggname or not os.path.exists(
os.path.join(eggname[0], "sqlobject.txt")):
eggname = self.fix_egginfo(eggname)
+ # Turn the egg directory name into a package name
eggname = eggname[0].replace(".egg-info", "")
+ pkgname = '-'.join(eggname.split('-')[:-2])
-+ pkgversion = eggname.split('-')[-2]
-+ pkgname = '%s == %s' % (pkgname, pkgversion)
++ try:
++ # Add the version info with proper syntax if it exists
++ pkgversion = eggname.split('-')[-2]
++ except IndexError:
++ pkgname = eggname
++ else:
++ pkgname = '%s == %s' % (pkgname, pkgversion)
if not "." in sys.path:
sys.path.append(".")
pkg_resources.working_set.add_entry(".")
More information about the fedora-extras-commits
mailing list