13178ca5fa
This synchronises sos in master to the current upstream sos-2.2 branch and includes all patches from RHEL6 not already present.
60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
--- sos-2.2/sos/__init__.py 2010-03-26 16:24:08.000000000 -0400
|
|
+++ /dev/null 2010-07-28 23:09:21.745168185 -0400
|
|
@@ -1,26 +0,0 @@
|
|
-## Copyright 2010 Red Hat, Inc.
|
|
-## Author: Adam Stokes <astokes@fedoraproject.org>
|
|
-
|
|
-## This program is free software; you can redistribute it and/or modify
|
|
-## it under the terms of the GNU General Public License as published by
|
|
-## the Free Software Foundation; either version 2 of the License, or
|
|
-## (at your option) any later version.
|
|
-
|
|
-## This program is distributed in the hope that it will be useful,
|
|
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
-## GNU General Public License for more details.
|
|
-
|
|
-## You should have received a copy of the GNU General Public License
|
|
-## along with this program; if not, write to the Free Software
|
|
-## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
-
|
|
-import gettext
|
|
-
|
|
-gettext_dir = "/usr/share/locale"
|
|
-gettext_app = "sos"
|
|
-
|
|
-gettext.bindtextdomain(gettext_app, gettext_dir)
|
|
-
|
|
-def _sos(msg):
|
|
- return gettext.dgettext(gettext_app, msg)
|
|
--- /dev/null 2010-07-28 23:09:21.745168185 -0400
|
|
+++ sos-2.2/sos/__init__.py.in 2010-07-29 12:21:12.237102733 -0400
|
|
@@ -0,0 +1,27 @@
|
|
+## Copyright 2010 Red Hat, Inc.
|
|
+## Author: Adam Stokes <astokes@fedoraproject.org>
|
|
+
|
|
+## This program is free software; you can redistribute it and/or modify
|
|
+## it under the terms of the GNU General Public License as published by
|
|
+## the Free Software Foundation; either version 2 of the License, or
|
|
+## (at your option) any later version.
|
|
+
|
|
+## This program is distributed in the hope that it will be useful,
|
|
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
+## GNU General Public License for more details.
|
|
+
|
|
+## You should have received a copy of the GNU General Public License
|
|
+## along with this program; if not, write to the Free Software
|
|
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
+
|
|
+import gettext
|
|
+
|
|
+gettext_dir = "/usr/share/locale"
|
|
+gettext_app = "sos"
|
|
+
|
|
+gettext.bindtextdomain(gettext_app, gettext_dir)
|
|
+
|
|
+__version__="@SOSVERSION@"
|
|
+def _sos(msg):
|
|
+ return gettext.dgettext(gettext_app, msg)
|