[MERGE] [Bug #220545] Read '/etc/colordiffrc' before '~/.colordiffrc'.

[Christophe TROESTLER]

Hi,

On Thu, 10 Jul 2008 12:33:23 +0300, Aaron Bentley wrote:
> 
> Christophe TROESTLER wrote:
> > Resubmitting this trivial patch for Bundle Buggy to pick up.
> 
> Please use the correct submit branch, so that Bundle Buggy can tell what
> project you're targetting.

OK.  Hopefully I did it fine this time. :)

ChriS
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: christophe.troestler at umh.ac.be-20080705110920-\
#   81ee7liqh9nm5y9e
# target_branch: http://bazaar.launchpad.net/~abentley/bzrtools\
#   /bzrtools.dev/
# testament_sha1: a422de35456da0628fa5753f858f0f2d6f6b38a4
# timestamp: 2008-07-10 12:25:36 +0200
# base_revision_id: aaron at aaronbentley.com-20080606023109-\
#   kl3qa8r3iku5oj7v
# 
# Begin patch
=== modified file 'colordiff.py'
--- colordiff.py	2008-04-19 15:10:17 +0000
+++ colordiff.py	2008-07-05 11:09:20 +0000
@@ -57,7 +57,8 @@
         self.target = target
         self.lp = LineParser()
         self.chunks = []
-        self._read_colordiffrc()
+        self._read_colordiffrc('/etc/colordiffrc')
+        self._read_colordiffrc(expanduser('~/.colordiffrc'))
         self.added_leading_tabs = 0
         self.added_trailing_whitespace = 0
         self.spurious_whitespace = 0
@@ -67,8 +68,7 @@
         self._old_lines = []
         self.check_style = check_style
 
-    def _read_colordiffrc(self):
-        path = expanduser('~/.colordiffrc')
+    def _read_colordiffrc(self, path):
         try:
             f = open(path, 'r')
         except IOError:

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUtqvdAAAYlfgEQQWef//1oA
FAq////xUAOY83aXbVXbOhhkomnqPU9IAeoGR6QAZAAABJRpSbyJgITJo0aYgAAA09QEppEk2o9T
9KDzUmEAaNNHqHqMgNAOYBMAJgABMAATAAEkkwmkyaYp6BMh6KaemkyADTQPUg0p5irHq4e4yPPB
bhaImknjkhFgfKnfLhVbBFrva6VVpdYhI13t8RwCxPF4NBK6m/kphqq/JO6r6HpQ1WzROunahUli
0jPTKDBxRUwWcT7ydcdk1rkis9w3BZxXG9ZSnAjMelWlzPStQURdDQboPKTMe9GuQuLYW7BUPchY
OUBhnFReKDyCZSHDhUFAiJAmCMCWQ6VhmQsDJ1M4tSisHHWngrKoQ+GwQbuoSu6eq551scmSL5FJ
lFMbi+mRSLf3wWH6K9R5XIy/byJEWwcOpVjuqvEJGK4KJU0HFbD9GYZ5rI0bRoOIxFwszSKHk2Mq
dnJiF62i0k8XSUhyGi8cXHFijjVQ4tnkKYtHmQrMKsJGMWVfjTqhxNIcg2iuJmFcnlatwmsxFwoF
8w3lhFxxFuFynCRGhTaTQiUhR4l7dKG80beKgtOadENEB1m0lmeFDmBOzLmklDE5OPndh8IaTXbx
1qhTowG81PDXcPCwL1I/tHM/S2GdLZLkMGc1h4edV5dCce9yGE5O7+JonkWETMVpOM1KjoRSlhSq
JGw0Fuw5So6qMGspTsTMzu5xef5MF8rb/EoMy6x6dWD13F5zPV+oNwyWB61UENncyqSZJm5Sz3ND
xaSbbrPowRNU8A7C+tVVlJr18BUXSjyTLBUIsfC+16T9QdZ1LUB3FQED8TUypoa+UIziMPDNCUQE
c3SRreNwUCdDpAeA1+7EodaQPE/QGYCe8gK0I8FzndQMcaFnVlygZPsJuLY59wG8WQFoGL35ZLAv
DaHYvAbQppyuSO1ZCx7a0instveG0VlOCY4arStL0NNUuwjQkaxk+gE7vbpGsGimE2aTB2NkAIhB
kCbKmMYNNkSDKhWP0W9MccE+BIO8YCrTTSN5rgs5cLq1MvJMBmDnFJwLgEUZuN1jKicfcBStPQYV
QoXhIiwy5DojN7Tl0NOxVGIDSVKRQA9FfHc43Fch1OBGNu8eUgexMCYNwmHsrHHJYMfTr8kpw8VJ
WAameKazOmTbRQfbUXb24/xdyRThQkEtqvdA