packages: pootle/pootle.spec, pootle/bug-2005.patch (NEW) - fix for from bu...

[glen]

Author: glen                         Date: Sat Oct  1 11:03:31 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix for from bug 2005

---- Files affected:
packages/pootle:
   pootle.spec (1.19 -> 1.20) , bug-2005.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/pootle/pootle.spec
diff -u packages/pootle/pootle.spec:1.19 packages/pootle/pootle.spec:1.20
--- packages/pootle/pootle.spec:1.19	Tue May 24 15:50:31 2011
+++ packages/pootle/pootle.spec	Sat Oct  1 13:03:25 2011
@@ -5,8 +5,8 @@
 Summary:	Localization and translation management web application
 Name:		pootle
 Version:	2.1.6
-Release:	1
-License:	GPL v2+
+Release:	2
+License:	GPL v2
 Group:		Development/Tools
 URL:		http://translate.sourceforge.net/wiki/pootle/index
 Source0:	http://downloads.sourceforge.net/translate/%{fullname}-%{version}.tar.bz2
@@ -16,6 +16,7 @@
 Patch1:		paths.patch
 Patch2:		homedir.patch
 Patch3:		iso-codes-message.patch
+Patch4:		bug-2005.patch
 BuildRequires:	python-devel
 BuildRequires:	python-modules
 BuildRequires:	rpm-pythonprov
@@ -62,6 +63,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__sed} -i -e '1s,#!.*env python,#!%{__python},' wsgi.py
 
@@ -138,6 +140,7 @@
 
 # don't clobber user $PATH
 mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/PootleServer
+install -p manage.py $RPM_BUILD_ROOT%{_sbindir}/pootle-manage
 install -p wsgi.py $RPM_BUILD_ROOT%{_datadir}/pootle
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
@@ -160,7 +163,7 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc ChangeLog README
+%doc ChangeLog CREDITS README
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/localsettings.py
@@ -214,6 +217,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2011/10/01 11:03:25  glen
+- fix for from bug 2005
+
 Revision 1.19  2011/05/24 13:50:31  glen
 - up to 2.1.6
 

================================================================
Index: packages/pootle/bug-2005.patch
diff -u /dev/null packages/pootle/bug-2005.patch:1.1
--- /dev/null	Sat Oct  1 13:03:31 2011
+++ packages/pootle/bug-2005.patch	Sat Oct  1 13:03:25 2011
@@ -0,0 +1,15 @@
+--- a/local_apps/pootle_autonotices/signals.py	2011-09-06 11:06:34.000000000 +0100
++++ b/local_apps/pootle_autonotices/signals.py	2011-09-06 11:09:26.000000000 +0100
+@@ -76,7 +76,11 @@
+     if raw:
+         return
+     if instance.id is not None and instance.istranslated():
+-        dbcopy = Unit.objects.get(id=instance.id)
++        try:
++            dbcopy = Unit.objects.get(id=instance.id)
++        except Unit.DoesNotExist:
++            logging.warning ('Unit %s could not be found', instance.id)
++            return
+         if dbcopy.istranslated():
+             # unit state didn't change, let's quit
+             return
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pootle/pootle.spec?r1=1.19&r2=1.20&f=u