Changes to 'refs/tags/spacewalk-java-1.8.118-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.118-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-07-26 15:59 +0000
Tagging package [spacewalk-java] version [1.8.118-1] in directory [java/].
Changes since spacewalk-proxy-installer-1.8.4-1:
Tomas Lestach (2):
816454 - do not commit already committed transaction
Automatic commit of package [spacewalk-java] release [1.8.118-1].
---
java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
11 years, 9 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit ab2be53e8e5346a426f14516dfec1f31420a0c47
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jul 26 17:59:47 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.118-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3971b65..b732734 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.117
+Version: 1.8.118
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -614,6 +614,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jul 26 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.118-1
+- 816454 - do not commit already committed transaction
+
* Thu Jul 26 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.117-1
- log a message when repo sync task is triggered
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e6b1c77..4f63d72 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.117-1 java/
+1.8.118-1 java/
commit 883b95a7d1dac3819f585e9214291c1e583e079e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jul 26 17:58:59 2012 +0200
816454 - do not commit already committed transaction
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
index 8a0b2a7..147da85 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
@@ -319,7 +319,7 @@ class ConnectionManager {
Session session = info.getSession();
try {
Transaction txn = info.getTransaction();
- if (txn != null) {
+ if (txn != null && !txn.wasCommitted() && !txn.wasRolledBack()) {
try {
txn.commit();
}
11 years, 9 months
Changes to 'refs/tags/spacewalk-proxy-installer-1.8.4-1'
by Michael Mraka
Tag 'spacewalk-proxy-installer-1.8.4-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-07-26 14:34 +0000
Tagging package [spacewalk-proxy-installer] version [1.8.4-1] in directory [proxy/installer/].
Changes since spacewalk-java-1.8.117-1:
Michael Mraka (4):
fixed indentation
reuse already assigned variable
make sure username/password is correct
Automatic commit of package [spacewalk-proxy-installer] release [1.8.4-1].
---
proxy/installer/configure-proxy.sh | 73 +++++++++++++------------
proxy/installer/spacewalk-proxy-installer.spec | 5 +
rel-eng/packages/spacewalk-proxy-installer | 2
3 files changed, 44 insertions(+), 36 deletions(-)
---
11 years, 9 months
proxy/installer rel-eng/packages
by Michael Mraka
proxy/installer/spacewalk-proxy-installer.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 411ce37206aa8d8cecc6fa4c4de7b2efcfd850c7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 26 16:34:32 2012 +0200
Automatic commit of package [spacewalk-proxy-installer] release [1.8.4-1].
diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec
index 7e2067f..239ce3c 100644
--- a/proxy/installer/spacewalk-proxy-installer.spec
+++ b/proxy/installer/spacewalk-proxy-installer.spec
@@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer
Summary: Spacewalk Proxy Server Installer
Group: Applications/Internet
License: GPLv2
-Version: 1.8.3
+Version: 1.8.4
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -96,6 +96,9 @@ spacewalk-pylint $RPM_BUILD_ROOT/usr/share/rhn
%doc LICENSE answers.txt
%changelog
+* Thu Jul 26 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.4-1
+- make sure username/password is correct
+
* Fri May 11 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.3-1
- make pylint happy
diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/spacewalk-proxy-installer
index 2dd4b6c..0949fb5 100644
--- a/rel-eng/packages/spacewalk-proxy-installer
+++ b/rel-eng/packages/spacewalk-proxy-installer
@@ -1 +1 @@
-1.8.3-1 proxy/installer/
+1.8.4-1 proxy/installer/
11 years, 9 months
3 commits - proxy/installer
by Michael Mraka
proxy/installer/configure-proxy.sh | 73 +++++++++++++++++++------------------
1 file changed, 39 insertions(+), 34 deletions(-)
New commits:
commit e92367c01a61d5c9990f0cea73850972a4df189e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 26 16:30:13 2012 +0200
make sure username/password is correct
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index 1f916b1..4ce948d 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -526,8 +526,14 @@ CHANNEL_LABEL="rhn_proxy_config_$SYSTEM_ID"
default_or_input "Create and populate configuration channel $CHANNEL_LABEL?" POPULATE_CONFIG_CHANNEL 'Y/n'
POPULATE_CONFIG_CHANNEL=$(yes_no $POPULATE_CONFIG_CHANNEL)
if [ "$POPULATE_CONFIG_CHANNEL" = "1" ]; then
- rhncfg-manager create-channel --server-name "$RHN_PARENT" \
- "$CHANNEL_LABEL"
+ RHNCFG_STATUS=1
+ while [ $RHNCFG_STATUS != 0 ] ; do
+ CONFIG_CHANNELS=$(rhncfg-manager list-channels --server-name "$RHN_PARENT")
+ RHNCFG_STATUS=$?
+ done
+ if ! grep -q -E "^ +$CHANNEL_LABEL$" <<<"$CONFIG_CHANNELS" ; then
+ rhncfg-manager create-channel --server-name "$RHN_PARENT" "$CHANNEL_LABEL"
+ fi
rhncfg-manager update --server-name "$RHN_PARENT" \
--channel="$CHANNEL_LABEL" \
$HTTPDCONFD_DIR/ssl.conf \
commit 22471047ce9d33843d0e58f504ea42f437808659
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 26 15:39:37 2012 +0200
reuse already assigned variable
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index fca776d..1f916b1 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -527,9 +527,9 @@ default_or_input "Create and populate configuration channel $CHANNEL_LABEL?" POP
POPULATE_CONFIG_CHANNEL=$(yes_no $POPULATE_CONFIG_CHANNEL)
if [ "$POPULATE_CONFIG_CHANNEL" = "1" ]; then
rhncfg-manager create-channel --server-name "$RHN_PARENT" \
- rhn_proxy_config_$SYSTEM_ID
+ "$CHANNEL_LABEL"
rhncfg-manager update --server-name "$RHN_PARENT" \
- --channel=rhn_proxy_config_$SYSTEM_ID \
+ --channel="$CHANNEL_LABEL" \
$HTTPDCONFD_DIR/ssl.conf \
$RHNCONF_DIR/rhn.conf \
$RHNCONF_DIR/cluster.ini \
commit d48e0d621183c92111a6dde2aa35f7bc09945762
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 26 14:40:13 2012 +0200
fixed indentation
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index 09870ae..fca776d 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -92,37 +92,36 @@ INTERACTIVE=1
CNAME_INDEX=0
while [ $# -ge 1 ]; do
- case $1 in
- --help | -h) print_help;;
- --answer-file=*) parse_answer_file $1;;
- --non-interactive) INTERACTIVE=0;;
-
- --version=*) VERSION=$(echo $1 | cut -d= -f2-);;
- --rhn-parent=*) RHN_PARENT=$(echo $1 | cut -d= -f2-);;
- --traceback-email=*) TRACEBACK_EMAIL=$(echo $1 | cut -d= -f2-);;
- --use-ssl=*) USE_SSL=$(echo $1 | cut -d= -f2-);;
- --ca-chain=*) CA_CHAIN=$(echo $1 | cut -d= -f2-);;
- --force-own-ca) FORCE_OWN_CA=1;;
- --http-proxy=*) HTTP_PROXY=$(echo $1 | cut -d= -f2-);;
- --http-username=*) HTTP_USERNAME=$(echo $1 | cut -d= -f2-);;
- --http-password=*) HTTP_PASSWORD=$(echo $1 | cut -d= -f2-);;
- --ssl-build-dir=*) SSL_BUILD_DIR=$(echo $1 | cut -d= -f2-);;
- --ssl-org=*) SSL_ORG=$(echo $1 | cut -d= -f2-);;
- --ssl-orgunit=*) SSL_ORGUNIT=$(echo $1 | cut -d= -f2-);;
- --ssl-common=*) SSL_COMMON=$(echo $1 | cut -d= -f2-);;
- --ssl-city=*) SSL_CITY=$(echo $1 | cut -d= -f2-);;
- --ssl-state=*) SSL_STATE=$(echo $1 | cut -d= -f2-);;
- --ssl-country=*) SSL_COUNTRY=$(echo $1 | cut -d= -f2-);;
- --ssl-email=*) SSL_EMAIL=$(echo $1 | cut -d= -f2-);;
- --ssl-password=*) SSL_PASSWORD=$(echo $1 | cut -d= -f2-);;
- --ssl-cname=*) SSL_CNAME_PARSED[CNAME_INDEX++]=--set-cname=$(echo $1 | cut -d= -f2-);;
- --install-monitoring=*) INSTALL_MONITORING=$(echo $1 | cut -d= -f2-);;
- --enable-scout=*) ENABLE_SCOUT=$(echo $1 | cut -d= -f2-);;
- --monitoring-parent=*) MONITORING_PARENT_IP=$(echo $1 | cut -d= -f2-);;
- --monitoring-parent-ip=*) MONITORING_PARENT_IP=$(echo $1 | cut -d= -f2-);;
- --populate-config-channel=*) POPULATE_CONFIG_CHANNEL=$(echo $1 | cut -d= -f2-);;
- --start-services=*) START_SERVICES=$(echo $1 | cut -d= -f2-);;
- *) echo Error: Invalid option $1
+ case $1 in
+ --help | -h) print_help;;
+ --answer-file=*) parse_answer_file $1;;
+ --non-interactive) INTERACTIVE=0;;
+ --version=*) VERSION=$(echo $1 | cut -d= -f2-);;
+ --rhn-parent=*) RHN_PARENT=$(echo $1 | cut -d= -f2-);;
+ --traceback-email=*) TRACEBACK_EMAIL=$(echo $1 | cut -d= -f2-);;
+ --use-ssl=*) USE_SSL=$(echo $1 | cut -d= -f2-);;
+ --ca-chain=*) CA_CHAIN=$(echo $1 | cut -d= -f2-);;
+ --force-own-ca) FORCE_OWN_CA=1;;
+ --http-proxy=*) HTTP_PROXY=$(echo $1 | cut -d= -f2-);;
+ --http-username=*) HTTP_USERNAME=$(echo $1 | cut -d= -f2-);;
+ --http-password=*) HTTP_PASSWORD=$(echo $1 | cut -d= -f2-);;
+ --ssl-build-dir=*) SSL_BUILD_DIR=$(echo $1 | cut -d= -f2-);;
+ --ssl-org=*) SSL_ORG=$(echo $1 | cut -d= -f2-);;
+ --ssl-orgunit=*) SSL_ORGUNIT=$(echo $1 | cut -d= -f2-);;
+ --ssl-common=*) SSL_COMMON=$(echo $1 | cut -d= -f2-);;
+ --ssl-city=*) SSL_CITY=$(echo $1 | cut -d= -f2-);;
+ --ssl-state=*) SSL_STATE=$(echo $1 | cut -d= -f2-);;
+ --ssl-country=*) SSL_COUNTRY=$(echo $1 | cut -d= -f2-);;
+ --ssl-email=*) SSL_EMAIL=$(echo $1 | cut -d= -f2-);;
+ --ssl-password=*) SSL_PASSWORD=$(echo $1 | cut -d= -f2-);;
+ --ssl-cname=*) SSL_CNAME_PARSED[CNAME_INDEX++]=--set-cname=$(echo $1 | cut -d= -f2-);;
+ --install-monitoring=*) INSTALL_MONITORING=$(echo $1 | cut -d= -f2-);;
+ --enable-scout=*) ENABLE_SCOUT=$(echo $1 | cut -d= -f2-);;
+ --monitoring-parent=*) MONITORING_PARENT_IP=$(echo $1 | cut -d= -f2-);;
+ --monitoring-parent-ip=*) MONITORING_PARENT_IP=$(echo $1 | cut -d= -f2-);;
+ --populate-config-channel=*) POPULATE_CONFIG_CHANNEL=$(echo $1 | cut -d= -f2-);;
+ --start-services=*) START_SERVICES=$(echo $1 | cut -d= -f2-);;
+ *) echo Error: Invalid option $1
esac
shift
done
11 years, 9 months
Changes to 'refs/tags/spacewalk-java-1.8.117-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.117-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-07-26 07:37 +0000
Tagging package [spacewalk-java] version [1.8.117-1] in directory [java/].
Changes since spacewalk-java-1.8.116-1:
Tomas Lestach (2):
log a message when repo sync task is triggered
Automatic commit of package [spacewalk-java] release [1.8.117-1].
---
java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java | 4 +---
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
---
11 years, 9 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 5098134e1917884fa7be9ee6d93c5f89fb8d3a1f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jul 26 09:37:12 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.117-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index e2fbc26..3971b65 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.116
+Version: 1.8.117
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -614,6 +614,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jul 26 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.117-1
+- log a message when repo sync task is triggered
+
* Wed Jul 25 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.116-1
- 843050 - fix recommended cobbler command
- 753056 - dissociate deleted crypto key from its kickstart profiles
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index c819335..e6b1c77 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.116-1 java/
+1.8.117-1 java/
11 years, 9 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 6d646c4d88c6ac865f11ea44ac9e713f3f0d8aaa
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jul 26 09:36:24 2012 +0200
log a message when repo sync task is triggered
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
index 5c8588a..e61ddb9 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
@@ -59,9 +59,7 @@ public class RepoSyncTask extends RhnJavaJob {
throw new JobExecutionException("No such channel with channel_id " + channelId);
}
- if (log.isDebugEnabled()) {
- log.debug("Syncing repos for channel: " + c.getName());
- }
+ log.info("Syncing repos for channel: " + c.getName());
executeExtCmd(getSyncCommand(c).toArray(new String[0]));
c.setLastSynced(new Date());
11 years, 9 months
Changes to 'refs/tags/spacewalk-java-1.8.116-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.116-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-07-25 15:13 +0000
Tagging package [spacewalk-java] version [1.8.116-1] in directory [java/].
Changes since osad-5.11.2-1:
Tomas Lestach (3):
753056 - dissociate deleted crypto key from its kickstart profiles
843050 - fix recommended cobbler command
Automatic commit of package [spacewalk-java] release [1.8.116-1].
---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java | 7 +++++++
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
19 files changed, 44 insertions(+), 33 deletions(-)
---
11 years, 9 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 1f1733501a80bff1729cb3624d8bd94307fa58db
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jul 25 17:13:38 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.116-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 2dbb764..e2fbc26 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.115
+Version: 1.8.116
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -614,6 +614,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Jul 25 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.116-1
+- 843050 - fix recommended cobbler command
+- 753056 - dissociate deleted crypto key from its kickstart profiles
+
* Tue Jul 24 2012 Jan Pazdziora 1.8.115-1
- Revert "removing unused string with trans-id 'gpgssl_keys.added'"
- Revert "removing unused string with trans-id 'gpgssl_keys.removed'"
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 0af9576..c819335 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.115-1 java/
+1.8.116-1 java/
11 years, 9 months