Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Undo compatibility breaks of PR#2 & [JENKINS-10383]
Prefer compatibility with prior behavior over new names for Windows operating system versions. Reverts some of the changes from the fix for [JENKINS-10383]. The plugin has not been released in 5+ years. Users have adapted to the existing behavior and will value retaining existing behavior more than they will value additional detection of specifically named Windows versions. Retain SunOS behavior from platformlabeler 1.1 The code in the 1.1 release accepted os.name as an argument, folded it to lower case, then compared the result with "SunOS". Since there are upper case characters in "SunOS", the comparison would never have matched. Since it did not match, the result fell through to return the lower case form "sunos" rather than "solaris" the code hints was intended. Fix [JENKINS-10383] - report bits of platform instead of JRE [JENKINS-10383] changes behavior on 64 bit Windows and 64 bit Linux running a 32 bit JRE. Release 1.1 reported "x86" (32 bit) on a 32 bit JRE running on a 64 bit operating system. Release 2.0 and later reports "amd64" (64 bit) on a 32 bit JRE running on a 64 bit operating system. Before [JENKINS-10383] the bits of the JRE were reported. After [JENKINS-10383] the bits of the operating system are reported. There is no behavioral change for 32 bit machines running a 32 bit JRE. There is no behavioral change for 64 bit machines running a 64 bit JRE. There is no behavioral change for machines that are not Windows and not Linux.
- Loading branch information
1 parent
6c35df3
commit 798c90f
Showing
1 changed file
with
50 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters