svn commit: r729786 - in /maven/components/branches/maven-2.1.x: ./ maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java

[bentmann]

Author: bentmann
Date: Sun Dec 28 14:07:22 2008
New Revision: 729786

URL: http://svn.apache.org/viewvc?rev=729786&view=rev
Log:
[MNG-3933] Profiles.xml does not pickup OS family
Submitted by: Pawel Paprota

o Merged from r729785

Modified:
    maven/components/branches/maven-2.1.x/   (props changed)
    
maven/components/branches/maven-2.1.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java

Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 28 14:07:22 2008
@@ -1,5 +1,5 @@
 
/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882,708790-728809,728834
-/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738
+/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738,729785
 /maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
 /maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990
 /maven/components/trunk:720001,721902,726845,729292

Modified: 
maven/components/branches/maven-2.1.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java?rev=729786&r1=729785&r2=729786&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.1.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
 (original)
+++ 
maven/components/branches/maven-2.1.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
 Sun Dec 28 14:07:22 2008
@@ -75,6 +75,8 @@
                 os.setFamily( profileOs.getFamily() );
                 os.setName( profileOs.getName() );
                 os.setVersion( profileOs.getVersion() );
+
+                activation.setOs( os );
             }
             
             org.apache.maven.profiles.ActivationFile profileFile = 
profileActivation.getFile();