rpms/hplip
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: RHEL-84817

Browse Source
This commit is contained in:
pdancak 2025-06-23 10:42:30 +02:00
parent cb9a5bc74a
commit 5938520058
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hp-plugin.in
View File

@ -16,7 +16,7 @@ download()
{
SOURCE="$1"
@bindir@/curl --create-dirs -O --output-dir ~/.hplip ${SOURCE}
@bindir@/curl --create-dirs -O --output-dir ~/.hplip --location ${SOURCE}
}
# link to the plugin

6
hplip-plugin-curl.patch
View File

@ -32,7 +32,7 @@ index 56683fb..031ceec 100755
- cmd = "%s --cache=off -P %s %s" % (wget,self.__plugin_path,src)
+ curl = utils.which("curl", True)
+ if curl:
+ cmd = "%s --create-dirs -O --output-dir %s %s" % (curl,self.__plugin_path,src)
+ cmd = "%s --create-dirs -O --output-dir %s --location %s" % (curl,self.__plugin_path,src)
log.debug(cmd)
status, output = utils.run(cmd)
- log.debug("wget returned: %d" % status)
@ -43,7 +43,7 @@ index 56683fb..031ceec 100755
src = os.path.join(PLUGIN_FALLBACK_LOCATION, self.__plugin_name)
log.info("Plugin is not accessible. Trying to download it from fallback location: [%s]" % src)
- cmd = "%s --cache=off -P %s %s" % (wget,self.__plugin_path,src)
+ cmd = "%s --create-dirs -O --output-dir %s %s" % (curl,self.__plugin_path,src)
+ cmd = "%s --create-dirs -O --output-dir %s --location %s" % (curl,self.__plugin_path,src)
log.debug(cmd)
status, output = utils.run(cmd)
@ -52,7 +52,7 @@ index 56683fb..031ceec 100755
status, filename = utils.download_from_network(digsig_url, digsig_file, True)
else:
- cmd = "%s --cache=off -P %s %s" % (wget,self.__plugin_path,digsig_url)
+ cmd = "%s --create-dirs -O --output-dir %s %s" % (curl, self.__plugin_path,digsig_url)
+ cmd = "%s --create-dirs -O --output-dir %s --location %s" % (curl, self.__plugin_path,digsig_url)
log.debug(cmd)
status, output = utils.run(cmd)
except IOError as e:

3
hplip.spec
View File

@ -962,6 +962,9 @@ find doc/images -type f -exec chmod 644 {} \;
%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
%changelog
Tue Jun 17 2025 Petr Dancak <pdancak@redhat.com> - 3.23.12-9
- enable following links with curl in all use cases
Resolves: RHEL-84817
- hp-plugin-download wrongly parsed file type
Resolves: RHEL-97437