Hello community,

here is the log from the commit of package aaa_base for openSUSE:13.1 checked 
in at 2013-10-17 15:13:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/aaa_base (Old)
 and      /work/SRC/openSUSE:13.1/.aaa_base.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "aaa_base"

Changes:
--------
--- /work/SRC/openSUSE:13.1/aaa_base/aaa_base.changes   2013-09-23 
10:46:47.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.aaa_base.new/aaa_base.changes      2013-10-19 
16:48:13.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Oct 14 12:42:28 UTC 2013 - [email protected]
+
+- change JRE_HOME only in a case it was not defined before (bnc#841284)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ aaa_base.spec ++++++
--- /var/tmp/diff_new_pack.EZ0NoA/_old  2013-10-19 16:48:13.000000000 +0200
+++ /var/tmp/diff_new_pack.EZ0NoA/_new  2013-10-19 16:48:13.000000000 +0200
@@ -18,7 +18,7 @@
 
 Name:           aaa_base
 Version:        13.1
-Release:        0
+Release:        17
 Url:            https://github.com/openSUSE/aaa_base
 Provides:       aaa_skel = %{version}-%{release}
 Provides:       bin

++++++ aaa_base-13.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/aaa_base-13.1/files/etc/profile.d/alljava.sh 
new/aaa_base-13.1/files/etc/profile.d/alljava.sh
--- old/aaa_base-13.1/files/etc/profile.d/alljava.sh    2013-08-26 
13:09:16.000000000 +0200
+++ new/aaa_base-13.1/files/etc/profile.d/alljava.sh    2013-10-14 
14:41:51.000000000 +0200
@@ -29,16 +29,17 @@
 
         case "$JPATH" in
             *jre*)
-                export JRE_HOME=$JPATH
+                [ -z "$JRE_HOME" ] && export JRE_HOME=$JPATH
                 ;;
 
             *)
-                export JRE_HOME=$JPATH/jre
+                [ -z "$JRE_HOME" ] && export JRE_HOME=$JPATH/jre
                 # it is development kit
                 if [ -x $JPATH/bin/javac ] ; then
                     export JDK_HOME=$JPATH
                     export SDK_HOME=$JPATH
-                    break; # we found a JRE + SDK -- don't look any further
+                    unset JPATH
+                    break 2; # we found a JRE + SDK -- don't look any further
                 fi
                 ;;
         esac

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to