openmamba/autospec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libnetwork.lib: do not convert curl dumps to lowercase letters

Browse Source 
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-04-29 00:10:30 +02:00
parent d848b0a5b9
commit 8f57ec4a1c
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -51,6 +51,12 @@ Wed Apr 18 2012 Davide Madrisan <davide.madrisan(a)gmail.com>
specfile.newrelease(): do not ignore the release set by user at command specfile.newrelease(): do not ignore the release set by user at command
line. (Bug discovered by Silvan Calarco). line. (Bug discovered by Silvan Calarco).
+ bugfix
* lib/libnetwork.lib - Davide Madrisan:
repository.get_srpm_pckname_from_site(): do not lower the curl dump.
This obviously modify the name of packages containing uppercase letters...
(Another regression (!) discovered and debugged by Silvan Calarco).
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Changes in version 1.9.4 Changes in version 1.9.4

17
lib/libnetwork.lib.in
View File

@ -79,7 +79,7 @@ function repository.get_srpm_pckname_from_site() {
[ "$is_ftp" != "$is_html" ] || notify.error $"\ [ "$is_ftp" != "$is_html" ] || notify.error $"\
(bug)"" -- $FUNCNAME: "$"usage error (--ftp/--html)" (bug)"" -- $FUNCNAME: "$"usage error (--ftp/--html)"
local pck_name="$(echo "$1" | tr A-Z a-z)" local pck_name="$1"
local infile="$2" local infile="$2"
[ "$pck_name" ] || notify.error $"\ [ "$pck_name" ] || notify.error $"\
@ -100,16 +100,15 @@ function repository.get_srpm_pckname_from_site() {
if [ "$is_html" = "1" ]; then if [ "$is_html" = "1" ]; then
notify.debug "$FUNCNAME: parsing HTML dump..." notify.debug "$FUNCNAME: parsing HTML dump..."
local pckname_from_HTML=($(tr A-Z a-z < $infile | \ local pckname_from_HTML=($(sed -n "\
sed -n "# remove HTML tags --> get a better input # remove HTML tags --> get a better input
/<a href=\".*\.src\.rpm\"/{ /<a href=\".*\.src\.rpm\"/{
s|.*<a href=\"\([^\"]*\)\".*|\1| s|.*<[aA]\+ [hH]\+[rR]\+[eE]\+[fF]\+=\"\([^\"]*\)\".*|\1|
{/$regexpr/p}}")) {/$regexpr/p}}" $infile))
echo "${pckname_from_HTML[*]}" echo "${pckname_from_HTML[*]}"
elif [ "$is_ftp" = "1" ]; then elif [ "$is_ftp" = "1" ]; then
notify.debug "$FUNCNAME: parsing FTP dump..." notify.debug "$FUNCNAME: parsing FTP dump..."
local pckname_from_FTP=($(tr A-Z a-z < $infile | \ local pckname_from_FTP=($(sed -n "s,.*\ ,,;{/$regexpr/p}" $infile))
sed -n "s,.*\ ,,;{/$regexpr/p}"))
echo "${pckname_from_FTP[*]}" echo "${pckname_from_FTP[*]}"
fi fi
} }
@ -865,6 +864,8 @@ function git.create_tarball() {
local destdir local destdir
# FIXME: add support for proxy # FIXME: add support for proxy
# HINT: git config --global http.proxy http://user:pwd@proxy.srv.com:port
# see: http://bardofschool.blogspot.fr/2008/11/use-git-behind-proxy.html
local proxy proxy_user local proxy proxy_user
eval set -- "$ARGS" eval set -- "$ARGS"