Projet

Général

Profil

0001-misc-use-relative-imports-to-get-publisher-in-ctl-co.patch

Frédéric Péters, 30 septembre 2019 13:32

Télécharger (5,76 ko)

Voir les différences: 

Subject: [PATCH] misc: use relative imports to get publisher in ctl command
 (#36518)


 wcs/ctl/backup.py          | 2 +-
 wcs/ctl/check_hobos.py     | 4 ++--
 wcs/ctl/delete_tenant.py   | 2 +-
 wcs/ctl/export_settings.py | 2 +-
 wcs/ctl/hobo_notify.py     | 2 +-
 wcs/ctl/rebuild_indexes.py | 2 +-
 wcs/ctl/restore.py         | 2 +-
 wcs/ctl/runscript.py       | 2 +-
 wcs/ctl/shell.py           | 2 +-
 wcs/ctl/wipe_data.py       | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)
wcs/ctl/backup.py
31 31 
                ])
32 32 

  		




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

  		




  34
  
  
    
        import publisher

  		




  
  34
  
    
        from .. import publisher

  		




  35
  35
  
    

  		




  36
  36
  
    
        publisher.WcsPublisher.configure(self.config)

  		




  37
  37
  
    
        pub = publisher.WcsPublisher.create_publisher(

  		












  

    
      wcs/ctl/check_hobos.py
    
  





  60
  60
  
    
                ])

  		




  61
  61
  
    

  		




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

  		




  63
  
  
    
        import publisher

  		




  
  63
  
    
        from .. import publisher

  		




  64
  64
  
    
        publisher.WcsPublisher.configure(self.config)

  		




  65
  65
  
    
        if sub_options.redeploy:

  		




  66
  66
  
    
            sub_options.ignore_timestamp = True

  		




  ......




  81
  81
  
    
            self.deploy(base_options, sub_options, args)

  		




  82
  82
  
    

  		




  83
  83
  
    
    def deploy(self, base_options, sub_options, args):

  		




  84
  
  
    
        import publisher

  		




  
  84
  
    
        from .. import publisher

  		




  85
  85
  
    

  		




  86
  86
  
    
        self.base_options = base_options

  		




  87
  87
  
    
        if sub_options.extra:

  		












  

    
      wcs/ctl/delete_tenant.py
    
  





  34
  34
  
    
                ])

  		




  35
  35
  
    

  		




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

  		




  37
  
  
    
        import publisher

  		




  
  37
  
    
        from .. import publisher

  		




  38
  38
  
    

  		




  39
  39
  
    
        publisher.WcsPublisher.configure(self.config)

  		




  40
  40
  
    
        pub = publisher.WcsPublisher.create_publisher(

  		












  

    
      wcs/ctl/export_settings.py
    
  





  28
  28
  
    
                ])

  		




  29
  29
  
    

  		




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

  		




  31
  
  
    
        import publisher

  		




  
  31
  
    
        from .. import publisher

  		




  32
  32
  
    
        self.config.remove_option('main', 'error_log')

  		




  33
  33
  
    
        publisher.WcsPublisher.configure(self.config)

  		




  34
  34
  
    
        pub = publisher.WcsPublisher.create_publisher(

  		












  

    
      wcs/ctl/hobo_notify.py
    
  





  40
  40
  
    
        notification = self.load_notification(args)

  		




  41
  41
  
    
        if not self.check_valid_notification(notification):

  		




  42
  42
  
    
            sys.exit(1)

  		




  43
  
  
    
        import publisher

  		




  
  43
  
    
        from .. import publisher

  		




  44
  44
  
    

  		




  45
  45
  
    
        publisher.WcsPublisher.configure(self.config)

  		




  46
  46
  
    
        pub = publisher.WcsPublisher.create_publisher(

  		












  

    
      wcs/ctl/rebuild_indexes.py
    
  





  52
  52
  
    
                ])

  		




  53
  53
  
    

  		




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

  		




  55
  
  
    
        import publisher

  		




  
  55
  
    
        from .. import publisher

  		




  56
  56
  
    

  		




  57
  57
  
    
        publisher.WcsPublisher.configure(self.config)

  		




  58
  58
  
    
        pub = publisher.WcsPublisher.create_publisher(

  		












  

    
      wcs/ctl/restore.py
    
  





  31
  31
  
    
                ])

  		




  32
  32
  
    

  		




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

  		




  34
  
  
    
        import publisher

  		




  
  34
  
    
        from .. import publisher

  		




  35
  35
  
    

  		




  36
  36
  
    
        self.config.remove_option('main', 'error_log')

  		




  37
  37
  
    
        publisher.WcsPublisher.configure(self.config)

  		












  

    
      wcs/ctl/runscript.py
    
  





  34
  34
  
    

  		




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

  		




  36
  36
  
    
        warnings.warn('Deprecated command, use management command', DeprecationWarning)

  		




  37
  
  
    
        import publisher

  		




  
  37
  
    
        from .. import publisher

  		




  38
  38
  
    
        self.config.remove_option('main', 'error_log')

  		




  39
  39
  
    
        publisher.WcsPublisher.configure(self.config)

  		




  40
  40
  
    
        publisher = publisher.WcsPublisher.create_publisher(

  		












  

    
      wcs/ctl/shell.py
    
  





  33
  33
  
    
                            dest='plain', default=False) ])

  		




  34
  34
  
    

  		




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

  		




  36
  
  
    
        import publisher

  		




  
  36
  
    
        from .. import publisher

  		




  37
  37
  
    
        self.config.remove_option('main', 'error_log')

  		




  38
  38
  
    
        publisher.WcsPublisher.configure(self.config)

  		




  39
  39
  
    
        publisher = publisher.WcsPublisher.create_publisher(

  		












  

    
      wcs/ctl/wipe_data.py
    
  





  35
  35
  
    
            print >> sys.stderr, 'you must specify --vhost'

  		




  36
  36
  
    
            sys.exit(1)

  		




  37
  37
  
    

  		




  38
  
  
    
        import publisher

  		




  
  38
  
    
        from .. import publisher

  		




  39
  39
  
    
        publisher.WcsPublisher.configure(self.config)

  		




  40
  40
  
    
        pub = publisher.WcsPublisher.create_publisher(

  		




  41
  41
  
    
                register_tld_names=False)

  		




  42
  
  
    
-