зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1779933 - Fix non-interactive zypper bootstrap r=firefox-build-system-reviewers,ahochheiden
The `-n` flag should be located directly after the zypper command, not after the subcommands. Differential Revision: https://phabricator.services.mozilla.com/D151979
This commit is contained in:
Родитель
071e0043a7
Коммит
ede1de7091
|
@ -98,29 +98,19 @@ class OpenSUSEBootstrapper(LinuxBootstrapper, BaseBootstrapper):
|
|||
self(["pip3", "install", "--upgrade", "pip", "--user"])
|
||||
self(["pip3", "install", "--upgrade", "Mercurial", "--user"])
|
||||
|
||||
def zypper_install(self, *packages):
|
||||
command = ["zypper", "install"]
|
||||
def zypper(self, *args):
|
||||
if self.no_interactive:
|
||||
command.append("-n")
|
||||
|
||||
command.extend(packages)
|
||||
command = ["zypper", "-n", *args]
|
||||
else:
|
||||
command = ["zypper", *args]
|
||||
|
||||
self.run_as_root(command)
|
||||
|
||||
def zypper_install(self, *packages):
|
||||
self.zypper("install", *packages)
|
||||
|
||||
def zypper_update(self, *packages):
|
||||
command = ["zypper", "update"]
|
||||
if self.no_interactive:
|
||||
command.append("-n")
|
||||
|
||||
command.extend(packages)
|
||||
|
||||
self.run_as_root(command)
|
||||
self.zypper("update", *packages)
|
||||
|
||||
def zypper_patterninstall(self, *packages):
|
||||
command = ["zypper", "install", "-t", "pattern"]
|
||||
if self.no_interactive:
|
||||
command.append("-y")
|
||||
|
||||
command.extend(packages)
|
||||
|
||||
self.run_as_root(command)
|
||||
self.zypper("install", "-t", "pattern", *packages)
|
||||
|
|
Загрузка…
Ссылка в новой задаче