Skip to content

fix(autoupdate): Handle xml namespace in xpath mode #3465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
r15ch13 merged 2 commits into from
May 15, 2019
Merged

fix(autoupdate): Handle xml namespace in xpath mode #3465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1277238
fix(autoupdate): Handle xml namespace in xpath mode
May 15, 2019
c4c7814
fix(autoupdate): Handle xml namespace in xpath mode
May 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion bin/checkver.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,16 @@ while ($in_progress -gt 0) {
}

if ($xpath) {
$xml = [xml]$page
# Find all `significant namespace declarations` from the XML file
$nsList = $xml.SelectNodes("//namespace::*[not(. = ../../namespace::*)]")
# Then add them into the NamespaceManager
$nsmgr = New-Object System.Xml.XmlNamespaceManager($xml.NameTable)
$nsList | ForEach-Object {
$nsmgr.AddNamespace($_.LocalName, $_.Value)
}
# Getting version from XML, using XPath
$ver = ([xml]$page).SelectSingleNode($xpath).'#text'
$ver = $xml.SelectSingleNode($xpath, $nsmgr).'#text'
if (!$ver) {
next "couldn't find '$xpath' in $url"
continue
Expand Down
11 changes: 10 additions & 1 deletion lib/autoupdate.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,16 @@ function find_hash_in_xml([String] $url, [Hashtable] $substitutions, [String] $x
$xpath = substitute $xpath $substitutions
}

$hash = $xml.SelectSingleNode($xpath).'#text'
# Find all `significant namespace declarations` from the XML file
$nsList = $xml.SelectNodes("//namespace::*[not(. = ../../namespace::*)]")
# Then add them into the NamespaceManager
$nsmgr = New-Object System.Xml.XmlNamespaceManager($xml.NameTable)
$nsList | ForEach-Object {
$nsmgr.AddNamespace($_.LocalName, $_.Value)
}

# Getting hash from XML, using XPath
$hash = $xml.SelectSingleNode($xpath, $nsmgr).'#text'
return format_hash $hash
}

Expand Down
⚡