← Back to branch summary

~ubuntu-branches/ubuntu/quantal/asterisk/quantal

« back to all changes in this revision

Viewing changes to channels/chan_vpb.cc

  • Committer: Bazaar Package Importer
  • Author(s): Jean-Michel Dault
  • Date: 2010-02-16 14:08:54 UTC
  • mfrom: (1.2.5 upstream) (8.3.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100216140854-rb2godspb9lduazl
Tags: 1:1.6.2.2-1ubuntu1
* Merge from Debian: security update
  * Changes:
  - debian/control: Change Maintainer
  - debian/control: Removed Uploaders field.
  - debian/control: Removed Debian Vcs-Svn entry and replaced with
      ubuntu-voip Vcs-Bzr, to reflect divergence in packages.
  - debian/asterisk.init : chown /dev/dahdi
  - debian/backports/hardy : add file
  - debian/backports/asterisk.init.hardy : add file

Show diffs side-by-side

added added

removed removed

Lines of Context:
channels/chan_vpb.cc
39
39
 
40
40
#include "asterisk.h"
41
41
 
42
 
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 209234 $")
 
42
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 228093 $")
43
43
 
44
44
#include "asterisk/lock.h"
45
45
#include "asterisk/utils.h"
2702
2702
        int num_cards = 0;
2703
2703
        try {
2704
2704
                num_cards = vpb_get_num_cards();
2705
 
        } catch (VpbException e) {
 
2705
        } catch (std::exception e) {
2706
2706
                ast_log(LOG_ERROR, "No Voicetronix cards detected\n");
2707
2707
                return AST_MODULE_LOAD_DECLINE;
2708
2708
        }