[Lsb-messages] /var/www/bzr/lsb/devel/distribution-checker r56: make sure 4.1 recognized in detect_standard_version() and Fedora in guess_package_manager() - the latter for bug 3398

Mats Wichmann mats at linuxfoundation.org
Wed Feb 15 16:23:51 UTC 2012


------------------------------------------------------------
revno: 56
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: distribution-checker
timestamp: Wed 2012-02-15 09:23:51 -0700
message:
  make sure 4.1 recognized in detect_standard_version() and Fedora in guess_package_manager() - the latter for bug 3398
modified:
  package/Makefile
  utils/Common.pm
  utils/Packages.pm
-------------- next part --------------
=== modified file 'package/Makefile'
--- a/package/Makefile	2012-02-14 15:37:47 +0000
+++ b/package/Makefile	2012-02-15 16:23:51 +0000
@@ -1,7 +1,7 @@
 BRANCH?=lsb
 PACKAGE=$(BRANCH)-dist-checker
 # export PACKAGE=moblin-dist-checker to make Moblin Distribution Checker package.
-VERSION_LSB=4.1.0.5
+VERSION_LSB=4.1.0.6
 VERSION_MOBLIN=2.0.1.9
 ifeq "$(BRANCH)" "moblin"
 	VERSION=$(VERSION_MOBLIN)

=== modified file 'utils/Common.pm'
--- a/utils/Common.pm	2011-02-17 21:49:21 +0000
+++ b/utils/Common.pm	2012-02-15 16:23:51 +0000
@@ -648,7 +648,8 @@
 	if ( does_shell_know('lsb_release') ) {
 		my $lsb_release_v = trim(`lsb_release -s -v`);
 		
-		if    ( $lsb_release_v =~ /4\.0/ ) { return "LSB 4.0"; }
+		if    ( $lsb_release_v =~ /4\.1/ ) { return "LSB 4.1"; }
+		elsif ( $lsb_release_v =~ /4\.0/ ) { return "LSB 4.0"; }
 		elsif ( $lsb_release_v =~ /3\.2/ ) { return "LSB 3.2"; }
 		elsif ( $lsb_release_v =~ /3\.1/ ) { return "LSB 3.1"; }
 		elsif ( $lsb_release_v =~ /3\.0/ ) { return "LSB 3.0"; }

=== modified file 'utils/Packages.pm'
--- a/utils/Packages.pm	2009-10-02 14:58:24 +0000
+++ b/utils/Packages.pm	2012-02-15 16:23:51 +0000
@@ -46,7 +46,7 @@
 sub guess_package_manager {
 	my ($host_os) = @_;
 	
-	if ( $host_os =~ /(suse|red\W?hat|asianux|mandriva|turbolinux|gentoo)/i ) {
+	if ( $host_os =~ /(suse|red\W?hat|fedora|asianux|mandriva|turbolinux|gentoo)/i ) {
 		# Native package manager for Suse and Redhat is rpm
 		return "rpm";
 	}



More information about the lsb-messages mailing list