From 86382ca14c8fbd4ab0b40ee3a31a9365b60886b7 Mon Sep 17 00:00:00 2001
From: Wez Furlong <wez@fb.com>
Date: Thu, 30 Aug 2018 21:55:20 -0700
Subject: [PATCH] factor out debian_deps()

Summary:
I want to access the list of deps without the install
instructions attached later in this stack of diffs in `shell_builder.py`.

Refs: https://github.com/facebook/watchman/pull/639

Reviewed By: snarkmaster

Differential Revision: D9552419

fbshipit-source-id: 333cfa0c33bc1aa623de7ac3546a8f1785869a4f
---
 build/fbcode_builder/fbcode_builder.py | 68 ++++++++++++++------------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/build/fbcode_builder/fbcode_builder.py b/build/fbcode_builder/fbcode_builder.py
index 67c46e118..5dc811bb0 100644
--- a/build/fbcode_builder/fbcode_builder.py
+++ b/build/fbcode_builder/fbcode_builder.py
@@ -178,42 +178,50 @@ class FBCodeBuilder(object):
         '''
         raise NotImplementedError
 
+    def debian_deps(self):
+        return [
+            'autoconf-archive',
+            'bison',
+            'build-essential',
+            'cmake',
+            'curl',
+            'flex',
+            'git',
+            'gperf',
+            'joe',
+            'libboost-all-dev',
+            'libcap-dev',
+            'libdouble-conversion-dev',
+            'libevent-dev',
+            'libgflags-dev',
+            'libgoogle-glog-dev',
+            'libkrb5-dev',
+            'libpcre3-dev',
+            'libpthread-stubs0-dev',
+            'libnuma-dev',
+            'libsasl2-dev',
+            'libsnappy-dev',
+            'libsqlite3-dev',
+            'libssl-dev',
+            'libtool',
+            'netcat-openbsd',
+            'pkg-config',
+            'sudo',
+            'unzip',
+            'wget',
+        ]
+
     #
     # Specific build helpers
     #
 
     def install_debian_deps(self):
         actions = [
-            self.run(ShellQuoted(
-                'apt-get update && apt-get install -yq '
-                'autoconf-archive '
-                'bison '
-                'build-essential '
-                'cmake '
-                'curl '
-                'flex '
-                'git '
-                'gperf '
-                'joe '
-                'libboost-all-dev '
-                'libcap-dev '
-                'libdouble-conversion-dev '
-                'libevent-dev '
-                'libgflags-dev '
-                'libgoogle-glog-dev '
-                'libkrb5-dev '
-                'libnuma-dev '
-                'libsasl2-dev '
-                'libsnappy-dev '
-                'libsqlite3-dev '
-                'libssl-dev '
-                'libtool '
-                'netcat-openbsd '
-                'pkg-config '
-                'sudo '
-                'unzip '
-                'wget'
-            )),
+            self.run(
+                ShellQuoted('apt-get update && apt-get install -yq {deps}').format(
+                    deps=shell_join(' ', (
+                        ShellQuoted(dep) for dep in self.debian_deps())))
+            ),
         ]
         gcc_version = self.option('gcc_version')