This reverts commit fcac95b065.
			
			
This commit is contained in:
		
							
								
								
									
										1
									
								
								lib/spack/external/__init__.py
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								lib/spack/external/__init__.py
									
									
									
									
										vendored
									
									
								
							@@ -38,7 +38,6 @@
 | 
				
			|||||||
* Homepage: https://pypi.python.org/pypi/distro
 | 
					* Homepage: https://pypi.python.org/pypi/distro
 | 
				
			||||||
* Usage: Provides a more stable linux distribution detection.
 | 
					* Usage: Provides a more stable linux distribution detection.
 | 
				
			||||||
* Version: 1.0.4 (last version supporting Python 2.6)
 | 
					* Version: 1.0.4 (last version supporting Python 2.6)
 | 
				
			||||||
* Note: Patched to disable lsb_release by default to improve Spack's startup time.
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
functools
 | 
					functools
 | 
				
			||||||
---------
 | 
					---------
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								lib/spack/external/distro.py
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								lib/spack/external/distro.py
									
									
									
									
										vendored
									
									
								
							@@ -12,8 +12,6 @@
 | 
				
			|||||||
# See the License for the specific language governing permissions and
 | 
					# See the License for the specific language governing permissions and
 | 
				
			||||||
# limitations under the License.
 | 
					# limitations under the License.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Spack managed modifications: use include_lsb=False by default.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
"""
 | 
					"""
 | 
				
			||||||
The ``distro`` package (``distro`` stands for Linux Distribution) provides
 | 
					The ``distro`` package (``distro`` stands for Linux Distribution) provides
 | 
				
			||||||
information about the Linux distribution it runs on, such as a reliable
 | 
					information about the Linux distribution it runs on, such as a reliable
 | 
				
			||||||
@@ -1074,7 +1072,7 @@ def _parse_distro_release_content(line):
 | 
				
			|||||||
        return distro_info
 | 
					        return distro_info
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
_distro = LinuxDistribution(include_lsb=False)
 | 
					_distro = LinuxDistribution()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def main():
 | 
					def main():
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user