← Back to branch summary

~noskcaj/ubuntu/saucy/dhelp/apache2.4

« back to all changes in this revision

Viewing changes to lib/dhelp.rb

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2008-11-11 20:10:49 UTC
  • mfrom: (3.1.2 lenny)
  • Revision ID: james.westby@ubuntu.com-20081111201049-kl96m6ox9zx8ti71
Tags: 0.6.14ubuntu1
https://launchpad.net/bugs/296795
* Merge from debian unstable, remaining changes: (LP: #296795)
  - Recommends: firefox-3.0.
  - Exit zero if the bdb module is not available; this usually
    indicates that dhelp is not configured yet.
  - Bring the version in the Makefile and the one in debian/changelog into
    sync.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/dhelp.rb
409
409
      end
410
410
      doc_dir_db.close
411
411
 
412
 
      indexer_opts = @opts.reject {|k,v| !([:index_file,
413
 
                                            :indexer_config_file].include? k)}
414
 
      indexer = Indexer.new(indexer_opts)
415
 
      indexer.index(index_paths, :incremental => !register_opts[:regenerate_index])
 
412
      # Only index documentation when we're reindex everything in the
 
413
      # background (see bug #487722). Not refactoring to keep the differences
 
414
      # as small as possible
 
415
      if register_opts[:regenerate_index]
 
416
        indexer_opts = @opts.reject {|k,v| !([:index_file,
 
417
                                              :indexer_config_file].include? k)}
 
418
        indexer = Indexer.new(indexer_opts)
 
419
        indexer.index(index_paths, :incremental => !register_opts[:regenerate_index])
 
420
      end
416
421
    end
417
422
  end
418
423