Bug 1290647 - FreeBSD bootstrap: Drop pkg_add(1) support as it reached EOL downstream. r=glandium draft
authorJan Beich <jbeich@FreeBSD.org>
Sat, 30 Jul 2016 06:09:54 +0000
changeset 395465 c845ac85a4a4a47ddd4d7a9502fed75f97330416
parent 395464 e08f62621a5838a0fe800d62c4f385c9e6c8157a
child 526997 c72d3a8b0acb8118dfb9beb0d4af2d800d19b04d
push id24777
push userbmo:jbeich@FreeBSD.org
push dateTue, 02 Aug 2016 08:19:11 +0000
reviewersglandium
bugs1290647
milestone51.0a1
Bug 1290647 - FreeBSD bootstrap: Drop pkg_add(1) support as it reached EOL downstream. r=glandium MozReview-Commit-ID: 36Yn6n5bOeQ
python/mozboot/mozboot/freebsd.py
--- a/python/mozboot/mozboot/freebsd.py
+++ b/python/mozboot/mozboot/freebsd.py
@@ -35,22 +35,19 @@ class FreeBSDBootstrapper(BaseBootstrapp
         if not self.which('unzip'):
             self.packages.append('unzip')
 
         # GCC 4.2 or Clang 3.4 in base are too old
         if self.flavor == 'freebsd' and self.version < 11:
             self.browser_packages.append('gcc')
 
     def pkg_install(self, *packages):
-        if self.which('pkg'):
-            command = ['pkg', 'install']
-            if self.no_interactive:
-                command.append('-y')
-        else:
-            command = ['pkg_add', '-Fr']
+        command = ['pkg', 'install']
+        if self.no_interactive:
+            command.append('-y')
 
         command.extend(packages)
         self.run_as_root(command)
 
     def install_system_packages(self):
         self.pkg_install(*self.packages)
 
     def install_browser_packages(self):