Dan Mick wrote:

> I would add a comment explaining the sort or it will surely be
> forgotten.

It seems you forgot to CC me (or 791913-submitter@) so I did not see this
in 402 days!

Updated patch attached.


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      la...@debian.org / chris-lamb.co.uk
       `-
diff --git a/debian/rules b/debian/rules
index b977a45..444cfcb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,18 +59,20 @@ override_dh_auto_install:
 override_dh_installinit:
        dh_installinit --no-start
        dh_installinit -pceph --no-start --name=rbdmap
-       # Install upstart configurations using dh_installinit
-       for conf in `ls -1 src/upstart/ceph*.conf | grep -v mds`; do \
+       # Install upstart configurations using dh_installinit. We sort to
+       # ensure that in entries added to the maintainer scripts appear in a
+       # reproducible order.
+       for conf in `ls -1 src/upstart/ceph*.conf | grep -v mds | LC_ALL=C 
sort`; do \
         name=`basename $$conf | cut -d . -f 1`; \
         cp -v $$conf debian/ceph.$$name.upstart; \
         dh_installinit -pceph --no-start --name=$$name; \
     done
-       for conf in `ls -1 src/upstart/ceph-mds*.conf`; do \
+       for conf in `ls -1 src/upstart/ceph-mds*.conf | LC_ALL=C sort`; do \
         name=`basename $$conf | cut -d . -f 1`; \
         cp -v $$conf debian/ceph-mds.$$name.upstart; \
         dh_installinit -pceph-mds --no-start --name=$$name; \
     done
-       for conf in `ls -1 src/upstart/radosgw*.conf`; do \
+       for conf in `ls -1 src/upstart/radosgw*.conf | LC_ALL=C sort`; do \
         name=`basename $$conf | cut -d . -f 1`; \
         [ $$name = "radosgw" ] && name="radosgw-instance";\
         cp -v $$conf debian/radosgw.$$name.upstart; \

Reply via email to