[Python-apps-commits] r7613 - in packages/slapos.core/trunk/debian (3 files)
arnau at users.alioth.debian.org
arnau at users.alioth.debian.org
Wed Oct 5 06:01:10 UTC 2011
Date: Wednesday, October 5, 2011 @ 06:01:08
Author: arnau
Revision: 7613
Drop fix_python26_missing_initgroups.patch as python2.7 is used.
Modified:
packages/slapos.core/trunk/debian/changelog
packages/slapos.core/trunk/debian/patches/series
Deleted:
packages/slapos.core/trunk/debian/patches/fix_python26_missing_initgroups.patch
Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog 2011-10-05 05:59:26 UTC (rev 7612)
+++ packages/slapos.core/trunk/debian/changelog 2011-10-05 06:01:08 UTC (rev 7613)
@@ -4,6 +4,7 @@
+ Use python2.7 instead (as supervisor is now working fine with
python2.7) and Build-Depends explicitely on >= 2.7.2-2~ because of a
bug when generating Depends in previous versions. Closes: #643999.
+ - Drop debian/patches/fix_python26_missing_initgroups.patch.
* debian/po:
+ Update German translation. Thanks to Chris Leick. Closes: #642137.
+ Update Swedish translation. Thanks to Martin Bagge. Closes: #640047.
Deleted: packages/slapos.core/trunk/debian/patches/fix_python26_missing_initgroups.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/fix_python26_missing_initgroups.patch 2011-10-05 05:59:26 UTC (rev 7612)
+++ packages/slapos.core/trunk/debian/patches/fix_python26_missing_initgroups.patch 2011-10-05 06:01:08 UTC (rev 7613)
@@ -1,31 +0,0 @@
-Author: Arnaud Fontaine <arnau at debian.org>
-Forwarded: not-needed
-Description: os.initgroups is only available on Python >= 2.7
- Rely instead on initgroups from Zope project which provides exactly
- the same API.
-
---- a/slapos/grid/utils.py 2011-06-10 11:45:33.092000207 +0900
-+++ b/slapos/grid/utils.py 2011-06-10 11:46:07.668000208 +0900
-@@ -36,6 +36,13 @@
- from exception import BuildoutFailedError, WrongPermissionError
- from hashlib import md5
-
-+try:
-+ # Python 2.7 only
-+ from os import initgroups
-+except:
-+ # Otherwise, fallback on Zope initgroups
-+ from initgroups import initgroups
-+
- # Such umask by default will create paths with full permission
- # for user, non writable by group and not accessible by others
- SAFE_UMASK = 027
-@@ -180,7 +187,7 @@
- user_name = pwd.getpwuid(uid)[0]
- group_list = [x.gr_gid for x in grp.getgrall() if user_name in x.gr_mem]
- group_list.append(gid)
-- os.initgroups(pwd.getpwuid(uid)[0], gid)
-+ initgroups(pwd.getpwuid(uid)[0], gid)
- os.setgid(gid)
- os.setuid(uid)
-
Modified: packages/slapos.core/trunk/debian/patches/series
===================================================================
--- packages/slapos.core/trunk/debian/patches/series 2011-10-05 05:59:26 UTC (rev 7612)
+++ packages/slapos.core/trunk/debian/patches/series 2011-10-05 06:01:08 UTC (rev 7613)
@@ -1,2 +1 @@
system_configuration_file_by_default.patch
-fix_python26_missing_initgroups.patch
More information about the Python-apps-commits
mailing list