From c3bd85f0de1a14544713fa442bea6e68327877cf Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 25 Apr 2014 17:08:20 +0100 Subject: Run hooks in sorted order (Closes: #745839). glob.glob() returns files in filesystem order, which is unpredictable on many modern filesystems. --- components/binary-hooks | 2 +- components/bootstrap-hooks | 2 +- components/chroot-hooks | 2 +- components/source-hooks | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/binary-hooks b/components/binary-hooks index 3e9cf07ca..d7bb4d7a7 100755 --- a/components/binary-hooks +++ b/components/binary-hooks @@ -80,7 +80,7 @@ def main(): hooks = glob.glob('config/hooks/*.hook') + glob.glob('config/hooks/*.hook.binary') - for hook in hooks: + for hook in sorted(hooks): if verbose: print('I: Copying config/hooks/*.hook.binary to binary/live-build') diff --git a/components/bootstrap-hooks b/components/bootstrap-hooks index e27f1adee..9eaa5ea71 100755 --- a/components/bootstrap-hooks +++ b/components/bootstrap-hooks @@ -80,7 +80,7 @@ def main(): hooks = glob.glob('config/hooks/*.hook') + glob.glob('config/hooks/*.hook.bootstrap') - for hook in hooks: + for hook in sorted(hooks): if verbose: print('I: Copying config/hooks/*.hook.bootstrap to chroot/live-build') diff --git a/components/chroot-hooks b/components/chroot-hooks index ab7bb25e0..a7a24816c 100755 --- a/components/chroot-hooks +++ b/components/chroot-hooks @@ -80,7 +80,7 @@ def main(): hooks = glob.glob('config/hooks/*.hook') + glob.glob('config/hooks/*.hook.chroot') - for hook in hooks: + for hook in sorted(hooks): if verbose: print('I: Copying config/hooks/*.hook.chroot to chroot/live-build') diff --git a/components/source-hooks b/components/source-hooks index 32be58bed..672b53f3e 100755 --- a/components/source-hooks +++ b/components/source-hooks @@ -80,7 +80,7 @@ def main(): hooks = glob.glob('config/hooks/*.hook') + glob.glob('config/hooks/*.hook.source') - for hook in hooks: + for hook in sorted(hooks): if verbose: print('I: Copying config/hooks/*.hook.source to source/live-build') -- cgit v1.2.3