Projet

Général

Profil

0001-hobo-correctly-import-and-setup-publisher-for-redepl.patch

Frédéric Péters, 12 janvier 2016 11:28

Télécharger (1,87 ko)

Voir les différences: 

Subject: [PATCH] hobo: correctly import and setup publisher for --redeploy
 command (#9599)


 wcs/ctl/check_hobos.py | 4 +++-
 wcs/ctl/hobo_notify.py | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)
wcs/ctl/check_hobos.py
46 46 
                ])
47 47 

  		




  48
  48
  
    
    def execute(self, base_options, sub_options, args):

  		




  
  49
  
    
        import publisher

  		




  
  50
  
    
        publisher.WcsPublisher.configure(self.config)

  		




  49
  51
  
    
        if sub_options.redeploy:

  		




  50
  52
  
    
            sub_options.ignore_timestamp = True

  		




  51
  
  
    
            for tenant in os.listdir(WcsPublisher.APP_DIR):

  		




  
  53
  
    
            for tenant in os.listdir(publisher.WcsPublisher.APP_DIR):

  		




  52
  54
  
    
                if tenant.endswith('.invalid'):

  		




  53
  55
  
    
                    continue

  		




  54
  56
  
    
                hobo_json_path = os.path.join(tenant, 'hobo.json')

  		












  

    
      wcs/ctl/hobo_notify.py
    
  





  29
  29
  
    
    name = 'hobo_notify'

  		




  30
  30
  
    

  		




  31
  31
  
    
    def execute(self, base_options, sub_options, args):

  		




  
  32
  
    
        print 'HELLO WORLD'

  		




  32
  33
  
    
        self.base_options = base_options

  		




  33
  34
  
    
        if sub_options.extra:

  		




  34
  35
  
    
            if not self.config.has_section('extra'):

  		




  ......




  37
  38
  
    
                self.config.set('extra', 'cmd_line_extra_%d' % i, extra)

  		




  38
  39
  
    

  		




  39
  40
  
    
        notification = self.load_notification(args)

  		




  
  41
  
    
        print 'notification:'

  		




  
  42
  
    
        print notification

  		




  40
  43
  
    
        if not self.check_valid_notification(notification):

  		




  41
  44
  
    
            sys.exit(1)

  		




  42
  45
  
    
        import publisher

  		




  43
  
  
    
-