rpms / fedora-release

Clone
Source Code
GIT

#110 Reset eclipse module (rhbz#1780827)
Merged 4 years ago by zbyszek. Opened 4 years ago by sgallagh.
rpms/ sgallagh/fedora-release f31  into  f31

file modified
+19 -1 
@@ -14,7 +14,7 @@ 
 

  Summary:        Fedora release files
 

  Name:           fedora-release
 

  Version:        31
 

- Release:        2
 

+ Release:        3
 

  License:        MIT
 

  URL:            https://fedoraproject.org/
 

  
@@ -538,6 +538,21 @@ 
 

  echo _DISABLED_ > %{buildroot}%{_prefix}/lib/variant
 

  

  

+ %posttrans common -p <lua>
 

+ -- Migrate users affected by rhbz#1780827 away from the eclipse module
 

+ -- But only do it once
 

+ original = "%{_sysconfdir}/dnf/modules.d/eclipse.module"
 

+ moved = original .. ".rpmmoved"
 

+ if not posix.stat(moved) then
 

+   if posix.stat(original) then
 

+     os.rename(original, moved)
 

+     print("Disabling eclipse module. See https://fedoraproject.org/wiki/Common_F31_bugs#eclipse-module-reset")
 

+   else
 

+     io.open(moved, "w"):close()
 

+   end
 

+ end
 

+ 

+ 

  %files common
 

  %license licenses/LICENSE licenses/Fedora-Legal-README.txt
 

  %{_prefix}/lib/fedora-release
 
@@ -647,6 +662,9 @@ 
 

  

  

  %changelog
 

+ * Wed Mar 18 2020 Stephen Gallagher <sgallagh@redhat.com> - 31-3
 

+ - Reset eclipse module (rhbz#1780827)
 

+ 

  * Mon Oct 21 2019 Michael Nguyen <mnguyen@redhat.com> - 31-2
 

  - Use CoreOS specific URLs and information in os-release

Approved by FESCo in https://pagure.io/fesco/issue/2356

Signed-off-by: Stephen Gallagher sgallagh@redhat.com

attn: @churchyard

Let me test this.

 
[~]$ podman run -ti fedora:31 /usr/bin/bash
[root@651322504baa /]# dnf module enable eclipse:latest
...
Enabling module streams:
 ant       1.10
 eclipse   latest
 maven     3.5


[root@651322504baa /]# dnf module list --enabled
...
Name     Stream       Profiles                Summary
ant      1.10 [d][e]  default [d]             Java build tool
eclipse  latest [e]   c, everything, java [d] An open, extensible IDE and application platform
maven    3.5 [d][e]   default [d]             Java project management and project comprehension tool


[root@651322504baa /]# dnf install https://kojipkgs.fedoraproject.org//work/tasks/2089/42592089/fedora-release-{container,common}-31-3.noarch.rpm
...
Upgrading:
 fedora-release-common    noarch 31-3 @commandline 20 k
 fedora-release-container noarch 31-3 @commandline 12 k

[root@651322504baa /]# dnf module list --enabled
...
Name   Stream       Profiles                  Summary
ant    1.10 [d][e]  default [d]               Java build tool
maven  3.5 [d][e]   default [d]               Java project management and project comprehension tool

[root@651322504baa /]# dnf module enable eclipse:latest
...
Enabling module streams:
 eclipse   latest

[root@651322504baa /]# dnf module list --enabled
...
Name     Stream       Profiles                Summary
ant      1.10 [d][e]  default [d]             Java build tool
eclipse  latest [e]   c, everything, java [d] An open, extensible IDE and application platform
maven    3.5 [d][e]   default [d]             Java project management and project comprehension tool

[root@651322504baa /]# dnf reinstall https://kojipkgs.fedoraproject.org//work/tasks/2089/42592089/fedora-release-{container,common}-31-3.noarch.rpm
...
Reinstalling:
 fedora-release-common    noarch 31-3 @commandline 20 k
 fedora-release-container noarch 31-3 @commandline 12 k

[root@651322504baa /]# dnf module list --enabled
...
Name     Stream       Profiles                Summary
ant      1.10 [d][e]  default [d]             Java build tool
eclipse  latest [e]   c, everything, java [d] An open, extensible IDE and application platform
maven    3.5 [d][e]   default [d]             Java project management and project comprehension tool

I added the issue to the F31 common bugs page. This isn't following the usual process, but this is a "prioritized bug", so I took the liberty.

https://fedoraproject.org/wiki/Common_F31_bugs#eclipse-module-reset

@churchyard @zbyszek Does that constitute a review approval from either or both of you?

Hmm, could you check that https://fedoraproject.org/wiki/Common_F31_bugs#eclipse-module-reset is OK, and write the link from the reset scriptlet? I think that was the idea in meeting.

Your patch looks OK but I didn't actually test it, so I can't sign off on it. And I don't understand @churchyard's comment. I'll try to test it later today if nobody beats me to it.

My comment demonstrates that it works. The link should be added however in order to merge this.

Updated and force-pushed.

[root@4668c953a588 repo]# dnf update fedora-release-common --repofrompath=a,/repo --nogpgcheck
Added a repo from /repo
Last metadata expiration check: 0:00:14 ago on Fri Mar 20 18:57:51 2020.
Dependencies resolved.
=====================================================================================================================================================================================================================
 Package                                                           Architecture                                    Version                                          Repository                                  Size
=====================================================================================================================================================================================================================
Upgrading:
 fedora-release-common                                             noarch                                          31-3                                             a                                           20 k
 fedora-release-container                                          noarch                                          31-3                                             a                                           12 k

Transaction Summary
=====================================================================================================================================================================================================================
Upgrade  2 Packages

Total size: 33 k
Is this ok [y/N]: y
Downloading Packages:
Running transaction check
Transaction check succeeded.
Running transaction test
Transaction test succeeded.
Running transaction
  Preparing        :                                                                                                                                                                                             1/1 
  Running scriptlet: fedora-release-container-31-3.noarch                                                                                                                                                        1/1 
  Upgrading        : fedora-release-container-31-3.noarch                                                                                                                                                        1/4 
  Upgrading        : fedora-release-common-31-3.noarch                                                                                                                                                           2/4 
  Cleanup          : fedora-release-common-31-2.noarch                                                                                                                                                           3/4 
  Cleanup          : fedora-release-container-31-2.noarch                                                                                                                                                        4/4 
  Running scriptlet: fedora-release-common-31-3.noarch                                                                                                                                                           4/4 
Disabling eclipse module. See https://fedoraproject.org/wiki/Common_F31_bugs#eclipse-module-reset
  Running scriptlet: fedora-release-container-31-2.noarch                                                                                                                                                        4/4 
  Verifying        : fedora-release-common-31-3.noarch                                                                                                                                                           1/4 
  Verifying        : fedora-release-common-31-2.noarch                                                                                                                                                           2/4 
  Verifying        : fedora-release-container-31-3.noarch                                                                                                                                                        3/4 
  Verifying        : fedora-release-container-31-2.noarch                                                                                                                                                        4/4 

Upgraded:
  fedora-release-common-31-3.noarch                                                                       fedora-release-container-31-3.noarch                                                                      

Complete!
[root@4668c953a588 repo]# ls /etc/dnf/modules.d/ -l
total 12
-rw-r--r--. 1 root root 51 Mar 20 18:56 ant.module
-rw-r--r--. 1 root root 62 Mar 20 18:56 eclipse.module.rpmmoved
-rw-r--r--. 1 root root 54 Mar 20 18:56 maven.module

rebased onto bfc4c31
4 years ago

Yep, LGTM too.

[root@2466b974982c /]# dnf install https://kojipkgs.fedoraproject.org//work/tasks/206/42640206/fedora-release-{common,container}-31-3.noarch.rpm
...
  Running scriptlet: fedora-release-common-31-3.noarch                                                                        4/4 
Disabling eclipse module. See https://fedoraproject.org/wiki/Common_F31_bugs#eclipse-module-reset
  Running scriptlet: fedora-release-container-31-2.noarch                                                                     4/4

Pull-Request has been merged by zbyszek
4 years ago

Should I build the package?

Should I build the package?

Yes, please.

fedora-release is one of those packages that needs special perms to build (well, it will build for you, but fail tagging).

@mohanboddu can you do a build, or figure this into your next builds for other reasons?

OMG, not that thing again. Where can I file a ticket to discuss killing this restriction?

FESCo I guess.

Duh, koji shows my build as the last successful build for fedora-release, but looking more closely shows that is not tagged into anything. Can someone please rebuild or tag the build into f31-candidates or whatever the appropriate place is?

https://koji.fedoraproject.org/koji/buildinfo?buildID=1479827
Edited 4 years ago by zbyszek
Changes Summary 1
+19 -1
file changed
fedora-release.spec
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.