From 86e869ed1cfe28b5d199d87d8bdf31a2509aad01 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Mon, 17 Apr 2006 18:06:36 +0000 Subject: [PATCH] stabilize make conf output from erich, bug 1242 --- refpolicy/Changelog | 1 + refpolicy/support/segenxml.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/refpolicy/Changelog b/refpolicy/Changelog index ba8418075..2f1134d3f 100644 --- a/refpolicy/Changelog +++ b/refpolicy/Changelog @@ -1,3 +1,4 @@ +- Patch to stabilize modules.conf `make conf` output, from Erich Schubert. - Move xconsole_device_t from devices to xserver since it is not actually a device, it is a named pipe. - Handle nonexistant .fc and .if files in devel Makefile by diff --git a/refpolicy/support/segenxml.py b/refpolicy/support/segenxml.py index ad4dcfd4c..f25cd6178 100755 --- a/refpolicy/support/segenxml.py +++ b/refpolicy/support/segenxml.py @@ -214,7 +214,9 @@ def getLayerXML (layerName, directories): # For each module file in the layer, add its XML. for directory in directories: - for module in glob.glob("%s/*.if" % directory): + modules = glob.glob("%s/*.if" % directory) + modules.sort() + for module in modules: layer_buf += getModuleXML(module) layer_buf.append("\n")