Skip to content

test_ppa_source: accept both http and https URLs (SC-825)#1292

Merged
blackboxsw merged 1 commit into
canonical:mainfrom
paride:test_apt-https-ppa
Feb 22, 2022
Merged

test_ppa_source: accept both http and https URLs (SC-825)#1292
blackboxsw merged 1 commit into
canonical:mainfrom
paride:test_apt-https-ppa

Conversation

@paride
Copy link
Copy Markdown
Contributor

@paride paride commented Feb 22, 2022

software-properties 0.99.18 now adds PPAs with HTTPS URLs in
sources.list when using add-apt-repository. This change only
affects Jammy.

We could use a regexp to match both, but it's simpler to just remove
the protocol from the search string.

Proposed Commit Message

test_ppa_source: accept both http and https URLs

software-properties 0.99.18 (>= Jammy) adds PPAs with
HTTPS URLs in sources.list when using add-apt-repository.
Older versions still add plain HTTP URLs.

We could use a regexp to match both, but it's simpler to just
remove the protocol from the search string.

Additional Context

Spotted by Jenkins.

 AssertionError: assert 'http://ppa.launchpad.net/simplestreams-dev/trunk/ubuntu' in 'deb https://ppa.launchpadcontent.net/simplestreams-dev/trunk/ubuntu/ jammy main\n# deb-src https://ppa.launchpadcontent.net/simplestreams-dev/trunk/ubuntu/ jammy main'

Test Steps

Run the test against on Jammy.

Checklist:

  • My code follows the process laid out in the documentation
  • I have updated or added any unit tests accordingly
  • I have updated or added any documentation accordingly

software-properties 0.99.18 now adds PPAs with HTTPS URLs in
sources.list when using add-apt-repository. This change only
affects Jammy.

We could use a regexp to match both, but it's simpler to just remove
the protocol from the search string.
@paride paride changed the title test_ppa_source: accept both http and https URLs test_ppa_source: accept both http and https URLs (SC-825) Feb 22, 2022
@blackboxsw blackboxsw merged commit dbd99f6 into canonical:main Feb 22, 2022
holmanb pushed a commit to holmanb/cloud-init that referenced this pull request Feb 25, 2022
software-properties 0.99.18 now adds PPAs with HTTPS URLs in
sources.list when using add-apt-repository. This change only
affects Jammy.

We could use a regexp to match both, but it's simpler to just remove
the protocol from the search string.
holmanb pushed a commit to holmanb/cloud-init that referenced this pull request Feb 25, 2022
software-properties 0.99.18 now adds PPAs with HTTPS URLs in
sources.list when using add-apt-repository. This change only
affects Jammy.

We could use a regexp to match both, but it's simpler to just remove
the protocol from the search string.
blackboxsw pushed a commit to holmanb/cloud-init that referenced this pull request Feb 25, 2022
software-properties 0.99.18 now adds PPAs with HTTPS URLs in
sources.list when using add-apt-repository. This change only
affects Jammy.

We could use a regexp to match both, but it's simpler to just remove
the protocol from the search string.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants