Changeset 645
- Timestamp:
- 01/09/14 15:42:09 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/email2trac.py.in
r644 r645 39 39 -h,--help 40 40 -A, --agilo 41 -B, --bloodhound_product 41 42 -d, --debug 42 43 -E, --virtualenv <path> … … 893 894 self.logger.debug("function update_ticket_fields") 894 895 896 if self.parameters.bh_product: 897 if 'product' in user_dict: 898 if user_dict['product'] != ticket.env.product.prefix: 899 self.logging.warning("bloodhound products cannot be changed " 900 "- ignoring") 901 user_dict.pop('product') 902 895 903 ## Check only permission model on ticket updates 896 904 # … … 2683 2691 # 2684 2692 agilo = False 2693 bh_product = None 2685 2694 configfile = '@email2trac_conf@' 2686 2695 project = '' … … 2692 2701 virtualenv = '@virtualenv@' 2693 2702 2694 SHORT_OPT = 'AcdE:hf:np:t:v' 2695 LONG_OPT = ['agilo', 'component=', 'debug', 'dry-run', 'help', 'file=', 'project=', 'ticket_prefix=', 'virtualenv=', 'verbose'] 2703 SHORT_OPT = 'AB:cdE:hf:np:t:v' 2704 LONG_OPT = ['agilo', 'bloodhound_product=', 'component=', 'debug', 2705 'dry-run', 'help', 'file=', 'project=', 'ticket_prefix=', 2706 'virtualenv=', 'verbose'] 2696 2707 2697 2708 try: … … 2709 2720 elif opt in ['-A', '--agilo']: 2710 2721 agilo = True 2722 elif opt in ['-B', '--bloodhound_product']: 2723 bh_product = value 2711 2724 elif opt in ['-c', '--component']: 2712 2725 component = value … … 2749 2762 settings.verbose = verbose 2750 2763 2764 if bh_product: 2765 settings.bh_product = bh_product 2766 2751 2767 if not settings.debug and debug_interactive: 2752 2768 settings.debug = debug_interactive … … 2801 2817 from trac.web.href import Href 2802 2818 2819 try: 2820 import pkg_resources 2821 pkg = pkg_resources.get_distribution('BloodhoundMultiProduct') 2822 bloodhound = pkg.version.split()[:2] 2823 except pkg_resources.DistributionNotFound: 2824 # assume no bloodhound 2825 bloodhound = None 2826 2827 if bloodhound: 2828 from multiproduct.env import Environment, ProductEnvironment 2829 from multiproduct.ticket.web_ui import (ProductTicketModule 2830 as TicketModule) 2831 logger.debug("Found Bloodhound Distribution") 2832 2833 if not settings.bh_product: 2834 print __doc__ 2835 print 'No Bloodhound project defined (bh_project) in section:%s email2trac config file.' %(settings.project) 2836 sys.exit(1) 2837 2803 2838 if agilo: 2804 2839 … … 2837 2872 try: 2838 2873 env = Environment(settings['project'], create=0) 2874 2875 if bloodhound: 2876 ## possibly overkill testing if the multiproduct schema is a 2877 # new enough version 2878 # 2879 from multiproduct.env import MultiProductSystem 2880 mps = MultiProductSystem(env) 2881 if mps.get_version() > 4: 2882 try: 2883 env = ProductEnvironment(env, settings.bh_product, create=0) 2884 except LookupError: 2885 logger.error('%s is not a valid Bloodhound' %settings.bh_product) 2886 sys.exit(0) 2887 2839 2888 except IOError, detail: 2840 2889 logger.error("trac error: %s" %detail)
Note: See TracChangeset
for help on using the changeset viewer.