Bug 1494091: [mozharness] Remove unused query_version; r=Callek
authorTom Prince <mozilla@hocat.ca>
Tue, 02 Oct 2018 18:34:51 +0000
changeset 450417 e0c96dab418a5224a39e116f6056c13d993cca35
parent 450416 192acee588a64054cc615dd8ede045098fc17fe2
child 450418 3092221b48c0a4225a5169d22bed0200d67960df
push id234
push usermozilla@hocat.ca
push dateSat, 10 Nov 2018 00:08:05 +0000
treeherdermozilla-esr60@f2569ad7bd92 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs1494091
milestone60.3.1
Bug 1494091: [mozharness] Remove unused query_version; r=Callek Differential Revision: https://phabricator.services.mozilla.com/D7331
testing/mozharness/scripts/desktop_l10n.py
testing/mozharness/scripts/mobile_l10n.py
--- a/testing/mozharness/scripts/desktop_l10n.py
+++ b/testing/mozharness/scripts/desktop_l10n.py
@@ -118,17 +118,16 @@ class DesktopSingleLocale(LocalesMixin, 
             config_options=self.config_options,
             require_config_file=require_config_file,
             **buildscript_kwargs
         )
 
         self.bootstrap_env = None
         self.upload_env = None
         self.revision = None
-        self.version = None
         self.upload_urls = {}
         self.pushdate = None
         # upload_files is a dictionary of files to upload, keyed by locale.
         self.upload_files = {}
 
     def _pre_config_lock(self, rw_config):
         """replaces 'configuration_tokens' with their values, before the
            configuration gets locked. If some of the configuration_tokens
@@ -318,24 +317,16 @@ class DesktopSingleLocale(LocalesMixin, 
         # we want to log all the messages from make
         output = []
         for line in raw_output.split("\n"):
             output.append(line.strip())
         output = " ".join(output).strip()
         self.info('echo-variable-%s: %s' % (variable, output))
         return output
 
-    def query_version(self):
-        """Gets the version from the objdir.
-        Only valid after setup is run."""
-        if self.version:
-            return self.version
-        self.version = self._query_make_variable("MOZ_APP_VERSION")
-        return self.version
-
     def _map(self, func, items):
         """runs func for any item in items, calls the add_failure() for each
            error. It assumes that function returns 0 when successful.
            returns a two element tuple with (success_count, total_count)"""
         success_count = 0
         total_count = len(items)
         name = func.__name__
         for item in items:
--- a/testing/mozharness/scripts/mobile_l10n.py
+++ b/testing/mozharness/scripts/mobile_l10n.py
@@ -88,17 +88,16 @@ class MobileSingleLocale(LocalesMixin, T
             config_options=self.config_options,
             require_config_file=require_config_file,
             **buildscript_kwargs
         )
         self.base_package_name = None
         self.repack_env = None
         self.revision = None
         self.upload_env = None
-        self.version = None
         self.upload_urls = {}
 
     # Helper methods {{{2
     def query_repack_env(self):
         if self.repack_env:
             return self.repack_env
         c = self.config
         repack_env = self.query_env(partial_env=c.get("repack_env"))
@@ -174,25 +173,16 @@ class MobileSingleLocale(LocalesMixin, T
         if self.base_package_name:
             return self.base_package_name
         self.base_package_name = self._query_make_variable(
             "PACKAGE",
             make_args=['AB_CD=%(locale)s']
         )
         return self.base_package_name
 
-    def query_version(self):
-        """Get the package name from the objdir.
-        Only valid after setup is run.
-        """
-        if self.version:
-            return self.version
-        self.version = self._query_make_variable("MOZ_APP_VERSION")
-        return self.version
-
     def query_upload_url(self, locale):
         if locale in self.upload_urls:
             return self.upload_urls[locale]
         else:
             self.error("Can't determine the upload url for %s!" % locale)
 
     def query_abs_dirs(self):
         if self.abs_dirs: