Download files with deb and rpm extensions to packages subdirectory (h…

…itachienergy#3015)
sbbroot · Mar 13, 2022 · 7e27a7a · 7e27a7a
1 parent 8c8806e
commit 7e27a7a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...ble/playbooks/roles/repository/files/download-requirements/src/mode/debian_family_mode.py b/...ble/playbooks/roles/repository/files/download-requirements/src/mode/debian_family_mode.py
@@ -106,7 +106,8 @@ def _download_packages(self):
         os.chdir(self._cfg.script_path)
 
     def _download_file(self, file: str):
-        self._tools.wget.download(file, directory_prefix=self._cfg.dest_files)
+        output_path: Path = self._cfg.dest_packages if file.endswith('.deb') else self._cfg.dest_files
+        self._tools.wget.download(file, directory_prefix=output_path)
 
     def _download_grafana_dashboard(self, dashboard: str, output_file: Path):
         self._tools.wget.download(dashboard, output_document=output_file)

diff --git a/...le/playbooks/roles/repository/files/download-requirements/src/mode/red_hat_family_mode.py b/...le/playbooks/roles/repository/files/download-requirements/src/mode/red_hat_family_mode.py
@@ -186,7 +186,8 @@ def _download_packages(self):
                                                             destdir=self._cfg.dest_packages)
 
     def _download_file(self, file: str):
-        self._tools.wget.download(file, directory_prefix=self._cfg.dest_files, additional_params=False)
+        output_path: Path = self._cfg.dest_packages if file.endswith('.rpm') else self._cfg.dest_files
+        self._tools.wget.download(file, directory_prefix=output_path, additional_params=False)
 
     def _download_grafana_dashboard(self, dashboard: str, output_file: Path):
         self._tools.wget.download(dashboard, output_document=output_file, additional_params=False)