Skip to content
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.

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

deb: refine fluentd-apt-source #515

Merged
merged 5 commits into from
Jul 7, 2023
Merged

Conversation

kenhys
Copy link
Contributor

@kenhys kenhys commented Jul 6, 2023

  • Drop transitional apt-transport-https package

    • https support has been moved into the apt package.
  • Renamed to fluent-apt-source

    • It also provides transitional fluentd-apt-source package.

@kenhys
Copy link
Contributor Author

kenhys commented Jul 6, 2023

Even though modified /etc/apt/sources.list.d/fluentd.sources to v5.

apt upgrade -V
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
Calculating upgrade... Done
The following package was automatically installed and is no longer required:
   fluentd-apt-source (2023.6.29-1)
Use 'apt autoremove' to remove it.
The following NEW packages will be installed:
   fluent-apt-source (2023.6.29-1)
The following packages will be upgraded:
   fluentd-apt-source (2020.8.25-1 => 2023.6.29-1)
1 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Need to get 10.5 kB of archives.
After this operation, 12.3 kB of additional disk space will be used.
Do you want to continue? [Y/n] y
Get:1 http://192.168.11.2/5/debian/bullseye bullseye/contrib amd64 fluentd-apt-source all 2023.6.29-1 [2688 B]
Get:2 http://192.168.11.2/5/debian/bullseye bullseye/contrib amd64 fluent-apt-source all 2023.6.29-1 [7828 B]
Fetched 10.5 kB in 0s (0 B/s)          
debconf: delaying package configuration, since apt-utils is not installed
(Reading database ... 9429 files and directories currently installed.)
Preparing to unpack .../fluentd-apt-source_2023.6.29-1_all.deb ...
Unpacking fluentd-apt-source (2023.6.29-1) over (2020.8.25-1) ...
Selecting previously unselected package fluent-apt-source.
Preparing to unpack .../fluent-apt-source_2023.6.29-1_all.deb ...
Unpacking fluent-apt-source (2023.6.29-1) ...
Setting up fluent-apt-source (2023.6.29-1) ...

Configuration file '/etc/apt/sources.list.d/fluentd.sources'
 ==> Modified (by you or by a script) since installation.
 ==> Package distributor has shipped an updated version.
   What would you like to do about it ?  Your options are:
    Y or I  : install the package maintainer's version
    N or O  : keep your currently-installed version
      D     : show the differences between the versions
      Z     : start a shell to examine the situation
 The default action is to keep your current version.
*** fluentd.sources (Y/I/N/O/D/Z) [default=N] ? y
Installing new version of config file /etc/apt/sources.list.d/fluentd.sources ...
Setting up fluentd-apt-source (2023.6.29-1) ...

fluentd-apt-source package can be removed because it is transitional package.

# dpkg -l |grep fluent
ii  fluent-apt-source         2023.6.29-1                  all          GnuPG archive key and APT source of the Fluent Package archive
ii  fluentd-apt-source        2023.6.29-1                  all          Transitional package for fluent-apt-source
root@12b06a1a3f97:/etc/apt/sources.list.d# dpkg -L fluentd-apt-source
/.
/usr
/usr/share
/usr/share/doc
/usr/share/doc/fluentd-apt-source
/usr/share/doc/fluentd-apt-source/changelog.Debian.gz
/usr/share/doc/fluentd-apt-source/copyright
root@12b06a1a3f97:/etc/apt/sources.list.d# apt purge fluentd-apt-source
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
The following packages will be REMOVED:
  fluentd-apt-source*
0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded.
After this operation, 10.2 kB disk space will be freed.
Do you want to continue? [Y/n] y
(Reading database ... 9432 files and directories currently installed.)
Removing fluentd-apt-source (2023.6.29-1) ...
(Reading database ... 9429 files and directories currently installed.)
Purging configuration files for fluentd-apt-source (2023.6.29-1) ...

kenhys added 4 commits July 6, 2023 14:01
* Drop transitional apt-transport-https package
  * https support has been moved into the apt package.

* Renamed to fluent-apt-source
  * It also provides transitional fluentd-apt-source package.

Signed-off-by: Kentaro Hayashi <[email protected]>
Signed-off-by: Kentaro Hayashi <[email protected]>
Provides transitional package.

Signed-off-by: Kentaro Hayashi <[email protected]>
Signed-off-by: Kentaro Hayashi <[email protected]>
@kenhys kenhys force-pushed the fluent-apt-source branch from 862aef6 to 4163223 Compare July 6, 2023 05:03
@kenhys kenhys changed the title deb: renamd to fluent-apt-source deb: refine fluentd-apt-source Jul 6, 2023
@kenhys kenhys marked this pull request as ready for review July 6, 2023 05:06
@kenhys kenhys requested a review from daipom July 6, 2023 05:06
Copy link
Contributor

@daipom daipom left a comment

Signed-off-by: Kentaro Hayashi <[email protected]>
@kenhys
Copy link
Contributor Author

kenhys commented Jul 7, 2023

Thanks, I've fixed them.

@kenhys kenhys requested a review from daipom July 7, 2023 02:25
Copy link
Contributor

@daipom daipom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! LGTM!
I have confirmed that I can install the new package correctly in the environment where the old fluentd-apt-source is already installed.

@kenhys kenhys merged commit f0c7db7 into fluent:master Jul 7, 2023
@kenhys kenhys deleted the fluent-apt-source branch July 7, 2023 05:38
@kenhys
Copy link
Contributor Author

kenhys commented Jul 7, 2023

TODO: try Provides: also works as expected. It should be handled by another PR.

@kenhys
Copy link
Contributor Author

kenhys commented Jul 7, 2023

If it removes the transitional package entry and use Provides:, it can't be upgraded even if you point to v5.

Before (transitional):

  • even though rewriting fluentd.sources, you can upgrade to fluent-apt-source with apt upgrade.
  • fluentd-apt-source will removed(not purged), you must manually purge if you want

After (no transitional, use provides)

  • even though rewriting fluentd.sources, you can't upgrade to fluent-apt-source with apt upgrade. (must install manually with apt install -y ...)
  • fluentd-apt-source will be removed (not purged, so you must purge manually if you want)

@kenhys
Copy link
Contributor Author

kenhys commented Jul 7, 2023

As the former behavior is preferred, so stay as is.

@daipom
Copy link
Contributor

daipom commented Jul 7, 2023

Thanks for your check!
Understood!

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