Skip to content

Commit 26b5705

Browse files
Merge pull request #93 from luis-camero/noetic-devel
Removed check for build/usr/lib
2 parents d6ea958 + 4159d23 commit 26b5705

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

spinnaker_camera_driver/cmake/download_spinnaker

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -116,23 +116,21 @@ logging.info("CPU architecture is %s", arch)
116116
logging.info("OS code name is %s", os_code_name)
117117
logging.info("Destination folder is %s", destination_folder)
118118

119-
if not os.path.exists(os.path.join(os.getcwd(), "usr/lib/")):
120-
if not os.path.exists(os.path.join(os.getcwd(), folder_name)):
121-
cj = http.cookiejar.CookieJar()
122-
opener = urllib.request.build_opener(urllib.request.HTTPCookieProcessor(cj))
123-
opener.addheaders = [
124-
('User-agent', 'Mozilla/5.0'),
125-
('Referer', 'https://www.ptgrey.com')]
119+
if not os.path.exists(os.path.join(os.getcwd(), folder_name)):
120+
cj = http.cookiejar.CookieJar()
121+
opener = urllib.request.build_opener(urllib.request.HTTPCookieProcessor(cj))
122+
opener.addheaders = [
123+
('User-agent', 'Mozilla/5.0'),
124+
('Referer', 'https://www.ptgrey.com')]
126125

127-
logging.info("Downloading SDK archive from {0}...".format(archive_url))
128-
resp = opener.open(archive_url)
126+
logging.info("Downloading SDK archive from {0}...".format(archive_url))
127+
resp = opener.open(archive_url)
129128

130-
logging.info("Unpacking tarball.")
131-
with tarfile.open(mode="r:gz", fileobj=io.BytesIO(resp.read())) as tar:
132-
tar.extractall()
129+
logging.info("Unpacking tarball.")
130+
with tarfile.open(mode="r:gz", fileobj=io.BytesIO(resp.read())) as tar:
131+
tar.extractall()
133132

134133
logging.info("Unpacking debs.")
135-
#debs = glob.glob(os.path.join(os.getcwd(), folder_name, "*spinnaker-*.deb"))
136134
debs = glob.glob(os.path.join(os.getcwd(), folder_name, "*.deb"))
137135
unpack_dir = os.path.join(os.getcwd())
138136
if not os.path.exists(unpack_dir):

0 commit comments

Comments
 (0)