Browse Source

Cherry-pick upstream commit FILE5_17-4-geced9db "comment out python comment magic". Closes: #729970

Christoph Biedl 10 years ago
parent
commit
3ece815307

+ 28 - 0
debian/patches/cherry-pick.eced9db.python-over-detection.patch

@@ -0,0 +1,28 @@
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Sat Feb 15 01:30:52 2014 +0000
+Upstream-Commit: eced9dbd4aa438de22ff453c723136beac41a558
+Description:
+ comment out python comment magic cause other things like mediawiki use it.
+
+--- a/magic/Magdir/python
++++ b/magic/Magdir/python
+@@ -44,13 +44,13 @@
+ !:mime text/x-python
+ 
+ # comments
+-0	search/4096	'''
+->&0	regex	.*'''$	Python script text executable
+-!:mime text/x-python
++#0	search/4096	'''
++#>&0	regex	.*'''$	Python script text executable
++#!:mime text/x-python
+ 
+-0	search/4096	"""
+->&0	regex	.*"""$	Python script text executable
+-!:mime text/x-python
++#0	search/4096	"""
++#>&0	regex	.*"""$	Python script text executable
++#!:mime text/x-python
+ 
+ # try:
+ # except: or finally:

+ 1 - 0
debian/patches/series

@@ -9,3 +9,4 @@
 0010-mdadm.patch
 0011-btrfs.patch
 0012-lxt.patch
+cherry-pick.eced9db.python-over-detection.patch