equal
deleted
inserted
replaced
56 |
56 |
57 builder = None |
57 builder = None |
58 try: |
58 try: |
59 configBuilder = configuration.NestedConfigurationBuilder(open(ant.get_property(r'${prep.delivery.conf.parsed}'), 'r')) |
59 configBuilder = configuration.NestedConfigurationBuilder(open(ant.get_property(r'${prep.delivery.conf.parsed}'), 'r')) |
60 configSet = configBuilder.getConfiguration() |
60 configSet = configBuilder.getConfiguration() |
61 builder = preparation.PreparationBuilder(configSet.getConfigurations(), ant.get_property(r'${ccm.user.login}'), ant.get_property(r'${ccm.user.password}'), cache=ant.get_property(r'${ccm.cache.xml}')) |
61 password = ant.get_property(r'${ccm.user.password}') |
|
62 builder = preparation.PreparationBuilder(configSet.getConfigurations(), ant.get_property(r'${ccm.user.login}'), password, cache=ant.get_property(r'${ccm.cache.xml}')) |
62 builder.check() |
63 builder.check() |
63 builder.get_content() |
64 builder.get_content() |
64 builder.close() |
65 builder.close() |
65 except Exception, e: |
66 except Exception, e: |
66 print "ERROR: error found during preparation phase:" |
67 print "ERROR: error found during preparation phase:" |