Skip to content

[DataSourceUri] fix removePassword when password is at the end of uri - #66625

Merged
nyalldawson merged 1 commit into
qgis:masterfrom
troopa81:fix_removepassword_at_the_end
Jul 5, 2026
Merged

[DataSourceUri] fix removePassword when password is at the end of uri#66625
nyalldawson merged 1 commit into
qgis:masterfrom
troopa81:fix_removepassword_at_the_end

Conversation

@troopa81

@troopa81 troopa81 commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

Description

fix removePassword when password is at the end of uri

Identified when fixing #58303

AI tool usage

None

@github-actions github-actions Bot added this to the 4.2.0 milestone Jun 30, 2026
@troopa81 troopa81 added Bug Either a bug report, or a bug fix. Let's hope for the latter! backport queued_ltr_backports Queued Backports labels Jun 30, 2026
@github-actions

github-actions Bot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing.
To execute locally, unzip the downloaded zip file and run bin\qgis-bin.exe in the extracted directory.
You might be prompted by Windows Defender click "Run anyway"
(Built from commit d4619a6)

🍎 MacOS Qt6 builds

Download MacOS Qt6 builds of this PR for testing.
This app is not notarized, run sudo xattr -d com.apple.quarantine /Applications/QGIS*.app to avoid the warning
(Built from commit d4619a6)

@troopa81 troopa81 closed this Jul 1, 2026
@troopa81 troopa81 reopened this Jul 1, 2026
@nyalldawson
nyalldawson merged commit e4f9846 into qgis:master Jul 5, 2026
74 of 76 checks passed
@qgis-bot

qgis-bot commented Jul 5, 2026

Copy link
Copy Markdown
Collaborator

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply d4619a6eb47... fix(RemovePassword): fix case when password is at the end of uri
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging src/core/qgsdatasourceuri.cpp
CONFLICT (content): Merge conflict in src/core/qgsdatasourceuri.cpp
Auto-merging tests/src/core/testqgsdatasourceuri.cpp
CONFLICT (content): Merge conflict in tests/src/core/testqgsdatasourceuri.cpp

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-66625-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick d4619a6eb47a782f28682005d3a02268d7d612ba
# Push it to GitHub
git push --set-upstream origin backport-66625-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports

Then, create a pull request where the base branch is queued_ltr_backports and the compare/head branch is backport-66625-to-queued_ltr_backports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport queued_ltr_backports Queued Backports backport release-4_2 Bug Either a bug report, or a bug fix. Let's hope for the latter! failed backport The automated backport attempt failed, needs a manual backport

4 participants