← Back to branch summary

~ubuntu-branches/ubuntu/trusty/serf/trusty-updates

« back to all changes in this revision

Viewing changes to serfmake

  • Committer: Bazaar Package Importer
  • Author(s): Peter Samuelson
  • Date: 2010-02-14 23:04:17 UTC
  • mfrom: (1.2.3 upstream)
  • mto: (3.3.1 sid)
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20100214230417-8zjz7vd5plcoykaz
* New upstream release.
  - patches/libtool: update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
serfmake
162
162
 
163
163
class Builder:
164
164
  def __init__(self, params):
165
 
    try:
 
165
    if 'apr' in params:
166
166
      self.apr = APRConfig(params['apr'])
167
167
      self.apu = APUConfig(params['apr'])
168
 
    except:
 
168
    else:
169
169
      self.apr = APRConfig(None)
170
170
      self.apu = APUConfig(None)
171
171
 
329
329
 
330
330
  def __init__(self, search_dir):
331
331
    if search_dir:
332
 
      self.locations.append(search_dir)
333
 
      self.locations.append(os.path.join(search_dir, 'bin'))
334
 
    for dirname in self.locations:
 
332
      locations = [search_dir, os.path.join(search_dir, 'bin')]
 
333
    else:
 
334
      locations = self.locations
 
335
 
 
336
    for dirname in locations:
335
337
      bin = os.path.join(dirname, self.script_name)
336
338
      if os.access(bin, os.X_OK):
337
339
        self.bin = bin