backend/satellite_tools
by Milan Zazrivec
backend/satellite_tools/repo_plugins/yum_src.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a55288118f67d26d2b445220a0031f7b9c51cbb8
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 21 16:34:56 2012 +0100
877451 - add missing and
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py
index 56ed458..70068b5 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -131,7 +131,7 @@ class ContentSource(object):
repo.pkgdir = pkgdir
if not (repo.cfg.has_option(self.name, 'proxy') or repo.cfg.has_option('main', 'proxy')) \
- self.proxy_addr is not None:
+ and self.proxy_addr is not None:
repo.proxy = "http://%s" % self.proxy_addr
repo.proxy_username = self.proxy_user
repo.proxy_password = self.proxy_pass
11 years, 6 months
backend/satellite_tools
by Milan Zazrivec
backend/satellite_tools/repo_plugins/yum_src.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 818f91d4ef5a3db186d1c44fffd675ff4db3524a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 21 16:17:42 2012 +0100
877451 - honor yum's "proxy = _none_" settings
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py
index a7d82c4..56ed458 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -130,7 +130,8 @@ class ContentSource(object):
fileutils.makedirs(pkgdir, user='apache', group='apache')
repo.pkgdir = pkgdir
- if not repo.proxy and self.proxy_addr is not None:
+ if not (repo.cfg.has_option(self.name, 'proxy') or repo.cfg.has_option('main', 'proxy')) \
+ self.proxy_addr is not None:
repo.proxy = "http://%s" % self.proxy_addr
repo.proxy_username = self.proxy_user
repo.proxy_password = self.proxy_pass
11 years, 6 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java | 3 ++-
java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java | 8 ++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 12ee8d60a358cd3f435fdb88c61227e3d61f6b6e
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Nov 20 13:35:04 2012 +0100
Fix errors with unrequired field 'Prefix'
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java b/java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java
index e7726ad..3056834 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java
@@ -67,7 +67,8 @@ public abstract class UserEditActionHelper extends RhnAction {
targetUser.setFirstNames((String)form.get("firstNames"));
targetUser.setLastName((String)form.get("lastName"));
targetUser.setTitle((String)form.get("title"));
- targetUser.setPrefix((String)form.get("prefix"));
+ String prefix = (String)form.get("prefix");
+ targetUser.setPrefix(prefix.isEmpty() ? " " : prefix);
// Update PAM Authentication attribute
updatePamAttribute(loggedInUser, targetUser, form);
}
diff --git a/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java b/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java
index fa16d7c..c0097a0 100644
--- a/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java
@@ -224,12 +224,16 @@ public class CreateUserCommand {
* errors list.
*/
private void validatePrefix() {
- if (user.getPrefix() != null) {
+ String prefix = user.getPrefix();
+ if (prefix != null) {
// Make sure whether prefix is valid, if it is set
SortedSet validPrefixes = LocalizationService.getInstance().availablePrefixes();
+ if (prefix.isEmpty()) {
+ user.setPrefix(" ");
+ }
if (!validPrefixes.contains(user.getPrefix())) {
errors.add(new ValidatorError("error.user_invalid_prefix",
- user.getPrefix(), validPrefixes.toString()));
+ prefix, validPrefixes.toString()));
}
}
}
11 years, 6 months
client/tools
by Milan Zazrivec
client/tools/osad/src/dispatcher_client.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit d975ebaa5983cde2d3f63b1361a8e15994b3b6c5
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 21 11:51:31 2012 +0100
always commit the update
diff --git a/client/tools/osad/src/dispatcher_client.py b/client/tools/osad/src/dispatcher_client.py
index 1e100ee..e8beadc 100644
--- a/client/tools/osad/src/dispatcher_client.py
+++ b/client/tools/osad/src/dispatcher_client.py
@@ -200,8 +200,7 @@ class Client(jabber_lib.JabberClient):
state_id = self._get_push_state_id('online')
h = rhnSQL.prepare(self._query_update_client_message_received)
ret = h.execute(jid=jid, state_id=state_id)
- if ret:
- rhnSQL.commit()
+ rhnSQL.commit()
class InvalidClientError(Exception):
pass
11 years, 6 months
Changes to 'refs/tags/rhn-client-tools-1.9.5-1'
by Jan Pazdziora
Tag 'rhn-client-tools-1.9.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-21 09:43 +0000
Tagging package [rhn-client-tools] version [1.9.5-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-java-1.9.14-1:
Jan Pazdziora (1):
Automatic commit of package [rhn-client-tools] release [1.9.5-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
11 years, 6 months
client/rhel rel-eng/packages
by Jan Pazdziora
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 76de832c998e8c74d2dc65978a834cb5d5644414
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 21 10:43:17 2012 +0100
Automatic commit of package [rhn-client-tools] release [1.9.5-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 20a0360..82fbeaa 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.9.4
+Version: 1.9.5
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -339,6 +339,10 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Wed Nov 21 2012 Jan Pazdziora 1.9.5-1
+- 876328 - Merging the new translation work form RHEL 6.4
+- Revert "876328 - updating rhel client tools translations"
+
* Fri Nov 16 2012 Stephen Herr <sherr(a)redhat.com> 1.9.4-1
- 876740 - add server url edit screen to rhn_register tui
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 8673558..25c3218 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.9.4-1 client/rhel/rhn-client-tools/
+1.9.5-1 client/rhel/rhn-client-tools/
11 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.9.14-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.9.14-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-21 09:41 +0000
Tagging package [spacewalk-java] version [1.9.14-1] in directory [java/].
Changes since spacewalk-web-1.9.3-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.9.14-1].
---
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
11 years, 6 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 8ee61ed7d2437bd02539ba195a5bf6815de96d9c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 21 10:41:54 2012 +0100
Automatic commit of package [spacewalk-java] release [1.9.14-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 2f1f168..05afb4e 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.9.13
+Version: 1.9.14
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -617,6 +617,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Nov 21 2012 Jan Pazdziora 1.9.14-1
+- decrease distChannelMap release minimal length
+- No need to put empty lines to rhn_taskomatic_daemon.log.
+
* Fri Nov 16 2012 Jan Pazdziora 1.9.13-1
- add extra date parse check for errata.setDetails API
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 8bc2e89..a779798 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.13-1 java/
+1.9.14-1 java/
11 years, 6 months
Changes to 'refs/tags/spacewalk-web-1.9.3-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.9.3-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-21 09:41 +0000
Tagging package [spacewalk-web] version [1.9.3-1] in directory [web/].
Changes since spacewalk-utils-1.9.4-1:
Jan Pazdziora (3):
Revert "The ssm_rollback_by_tag_action_cb method no longer referenced, removing."
Revert "removed dead query"
Automatic commit of package [spacewalk-web] release [1.9.3-1].
---
rel-eng/packages/spacewalk-web | 2
web/modules/sniglets/Sniglets/ListView/SystemList.pm | 49 +++++++++++++++++++
web/spacewalk-web.spec | 7 ++
3 files changed, 56 insertions(+), 2 deletions(-)
---
11 years, 6 months
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 572b5986078332d5a72116a612de135ee068d420
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 21 10:41:27 2012 +0100
Automatic commit of package [spacewalk-web] release [1.9.3-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index d7b708d..eab61e7 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.9.2-1 web/
+1.9.3-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 03214e2..e3ea9f4 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.9.2
+Version: 1.9.3
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -253,6 +253,11 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Nov 21 2012 Jan Pazdziora 1.9.3-1
+- Revert "removed dead query"
+- Revert "The ssm_rollback_by_tag_action_cb method no longer referenced,
+ removing."
+
* Fri Nov 09 2012 Jan Pazdziora 1.9.2-1
- 490524 - Return the datetime in the local time zone.
- 490524 - Epoch is always in UTC, no time_zone setting for epoch case.
11 years, 6 months