Branch 'SPACEWALK-2.1' - 2 commits - rel-eng/build-missing-builds.conf rel-eng/releasers.conf
by Michael Mraka
rel-eng/build-missing-builds.conf | 2 +-
rel-eng/releasers.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c3ccb163cfb662d5db1a5cfe198ee730e90b2320
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 26 09:52:14 2014 +0100
update build-missing-builds.conf to Spacewalk 2.1
diff --git a/rel-eng/build-missing-builds.conf b/rel-eng/build-missing-builds.conf
index aa6cb24..df7634b 100644
--- a/rel-eng/build-missing-builds.conf
+++ b/rel-eng/build-missing-builds.conf
@@ -1,4 +1,4 @@
TITO_RELEASER=koji
-TAGS="spacewalk-nightly-rhel5 spacewalk-nightly-rhel6 spacewalk-nightly-fedora18 spacewalk-nightly-fedora19 spacewalk-nightly-fedora20"
+TAGS="spacewalk-2.1-rhel5 spacewalk-2.1-rhel6 spacewalk-2.1-fedora19 spacewalk-2.1-fedora20"
FEDORA_UPLOAD=0
commit 570e50c0d526127b7a6059cfae9de3fbc439ca39
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 26 09:46:56 2014 +0100
drop Fedora 18 from supported OS
diff --git a/rel-eng/releasers.conf b/rel-eng/releasers.conf
index 55ec8cd..2081d54 100644
--- a/rel-eng/releasers.conf
+++ b/rel-eng/releasers.conf
@@ -1,4 +1,4 @@
[koji]
releaser = tito.release.KojiGitReleaser
-autobuild_tags = spacewalk-2.1-rhel5 spacewalk-2.1-rhel6 spacewalk-2.1-fedora18 spacewalk-2.1-fedora19 spacewalk-2.1-fedora20
+autobuild_tags = spacewalk-2.1-rhel5 spacewalk-2.1-rhel6 spacewalk-2.1-fedora19 spacewalk-2.1-fedora20
git_url = git://git.fedorahosted.org/git/spacewalk.git
10 years, 2 months
Changes to 'refs/tags/spacewalk-utils-2.2.2-1'
by StephenHerr
Tag 'spacewalk-utils-2.2.2-1' created by Stephen Herr <sherr(a)redhat.com> at 2014-02-25 21:37 +0000
Tagging package [spacewalk-utils] version [2.2.2-1] in directory [utils/].
Changes since spacewalk-java-2.2.2-1:
Dimitar Yordanov (1):
1069879 - spacwalk-repo-sync prints the same message for every channel.
Stephen Herr (1):
Automatic commit of package [spacewalk-utils] release [2.2.2-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/cloneByDate.py | 13 ++++++-------
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 11 insertions(+), 9 deletions(-)
---
10 years, 2 months
2 commits - rel-eng/packages utils/cloneByDate.py utils/spacewalk-utils.spec
by StephenHerr
rel-eng/packages/spacewalk-utils | 2 +-
utils/cloneByDate.py | 13 ++++++-------
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 11 insertions(+), 9 deletions(-)
New commits:
commit e1a03be4b7b7b1f6980ef211881821f11ed66512
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Feb 25 16:37:59 2014 -0500
Automatic commit of package [spacewalk-utils] release [2.2.2-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index f432f36..e53bdc6 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-2.2.1-1 utils/
+2.2.2-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index c66208e..9cea310 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 2.2.1
+Version: 2.2.2
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -91,6 +91,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Tue Feb 25 2014 Stephen Herr <sherr(a)redhat.com> 2.2.2-1
+- 1069879 - spacwalk-repo-sync prints the same message for every channel.
+
* Tue Feb 25 2014 Tomas Lestach <tlestach(a)redhat.com> 2.2.1-1
- removing spacewalk18 and spacewalk19 channel repo configurations
- remove fc18 channel repo configurations
commit 25d8b41ec31b89b2372cd7d43f8bef41b0313dbc
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Tue Feb 25 16:37:39 2014 -0500
1069879 - spacwalk-repo-sync prints the same message for every channel.
diff --git a/utils/cloneByDate.py b/utils/cloneByDate.py
index 588a1da..7824395 100644
--- a/utils/cloneByDate.py
+++ b/utils/cloneByDate.py
@@ -128,7 +128,11 @@ def main(options):
print "Reading repository information."
-
+ if options.use_update_date:
+ options.use_update_date = 'update_date'
+ else:
+ options.use_update_date = 'issue_date'
+ print "Using %s." % options.use_update_date
cloners = []
needed_channels = []
@@ -561,13 +565,8 @@ class ChannelCloner:
""" Returns tuple of all available for cloning, and what falls in the date range"""
available_errata = self.db_api.applicable_errata(self.from_label, self.to_label)
to_clone = []
- if self.use_update_date:
- date_to_use = 'update_date'
- else:
- date_to_use = 'issue_date'
- print "Using ", date_to_use
for err in available_errata:
- if self.to_date and err[date_to_use].date() <= self.to_date.date():
+ if self.to_date and err[self.use_update_date].date() <= self.to_date.date():
if self.security_only:
if err['advisory_type'] == 'Security Advisory':
to_clone.append(err)
10 years, 2 months
Changes to 'refs/tags/spacewalk-java-2.2.2-1'
by Tomas Lestach
Tag 'spacewalk-java-2.2.2-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2014-02-25 15:54 +0000
Tagging package [spacewalk-java] version [2.2.2-1] in directory [java/].
Changes since spacewalk-backend-2.2.1-1:
Tomas Lestach (3):
remove unnecessarily nested else statement
initialize temporaryRoles within CreateUserCommand
Automatic commit of package [spacewalk-java] release [2.2.2-1].
---
java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java | 4 +---
java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java | 3 ++-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
---
10 years, 2 months
3 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java | 4 +---
java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java | 3 ++-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 7ae2deda0e93cee83c2f9e9accb53d7655f0d4e9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 25 16:54:10 2014 +0100
Automatic commit of package [spacewalk-java] release [2.2.2-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 199f0e4..7d375cf 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.2.1
+Version: 2.2.2
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Feb 25 2014 Tomas Lestach <tlestach(a)redhat.com> 2.2.2-1
+- initialize temporaryRoles within CreateUserCommand
+- remove unnecessarily nested else statement
+
* Tue Feb 25 2014 Tomas Lestach <tlestach(a)redhat.com> 2.2.1-1
- store the bounce_url back in the login page form
- rename label
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index f93c614..283b8b9 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.2.1-1 java/
+2.2.2-1 java/
commit 576d32ca1e17056dec7990ad47363359c7db0c7d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 25 16:36:56 2014 +0100
initialize temporaryRoles within CreateUserCommand
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 c749a5e..4ec2ca7 100644
--- a/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java
@@ -31,6 +31,7 @@ import com.redhat.rhn.frontend.events.NewUserEvent;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.SortedSet;
@@ -50,7 +51,7 @@ public class CreateUserCommand {
private Address addr;
private boolean makeOrgAdmin;
private boolean makeSatAdmin;
- private Set<Role> temporaryRoles;
+ private Set<Role> temporaryRoles = new HashSet<Role>();
private List<ValidatorError> errors;
private List<ValidatorError> passwordErrors;
commit 361bf8eadd2be6ef04aac3b599f240e78315be11
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 25 16:34:52 2014 +0100
remove unnecessarily nested else statement
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java
index 4977409..fe5c9c8 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java
@@ -52,9 +52,7 @@ public class LocalizedSubmitTag extends SubmitTag {
if (super.getStyleClass() != null) {
return (super.getStyleClass() + " btn btn-default");
}
- else {
- return "btn btn-default";
- }
+ return "btn btn-default";
}
/** {@inheritDoc}
10 years, 2 months
Changes to 'refs/tags/spacewalk-backend-2.2.1-1'
by Michael Mraka
Tag 'spacewalk-backend-2.2.1-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-02-25 14:52 +0000
Tagging package [spacewalk-backend] version [2.2.1-1] in directory [backend/].
Changes since SatConfig-cluster-2.2.2-1:
Michael Mraka (2):
1067443 - specify package only with version
Automatic commit of package [spacewalk-backend] release [2.2.1-1].
---
backend/spacewalk-backend.spec | 7 +++++--
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
10 years, 2 months
2 commits - backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 7 +++++--
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 415c674f1ac230090bfd6f638d7104ab487406d2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 25 15:52:10 2014 +0100
Automatic commit of package [spacewalk-backend] release [2.2.1-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index b834bff..0d5097e 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 2.2.0
+Version: 2.2.1
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -636,6 +636,9 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py*
%changelog
+* Tue Feb 25 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.2.1-1
+- 1067443 - specify package only with version
+
* Mon Feb 24 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.54-1
- 1067443 - workaround for rpm-python bug
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 6fbee66..e4e03e4 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.54-1 backend/
+2.2.1-1 backend/
commit 605a83ffb574ebe0a1876f2befa499b9bccde026
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 25 15:50:48 2014 +0100
1067443 - specify package only with version
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index a35243c..b834bff 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -111,7 +111,7 @@ Group: Applications/Internet
Requires: %{name}-server = %{version}-%{release}
%if 0%{?fedora} >= 20
# temporary workaround for bug BZ#1067443
-Requires: rpm-python <= 4.11.1-7
+Requires: rpm-python < 4.11.2
%endif
Obsoletes: rhns-server-xmlrpc < 5.3.0
Obsoletes: rhns-xmlrpc < 5.3.0
10 years, 2 months
Changes to 'refs/tags/SatConfig-cluster-2.2.2-1'
by Michael Mraka
Tag 'SatConfig-cluster-2.2.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-02-25 10:46 +0000
Tagging package [SatConfig-cluster] version [2.2.2-1] in directory [monitoring/SatConfig/cluster/].
Changes since SatConfig-cluster-2.2.1-1:
Michael Mraka (2):
1069332 - fixing ip syntax
Automatic commit of package [SatConfig-cluster] release [2.2.2-1].
---
monitoring/SatConfig/cluster/IpAddr.pm | 2 +-
monitoring/SatConfig/cluster/SatConfig-cluster.spec | 5 ++++-
rel-eng/packages/SatConfig-cluster | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
10 years, 2 months
2 commits - monitoring/SatConfig rel-eng/packages
by Michael Mraka
monitoring/SatConfig/cluster/IpAddr.pm | 2 +-
monitoring/SatConfig/cluster/SatConfig-cluster.spec | 5 ++++-
rel-eng/packages/SatConfig-cluster | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit f7ed1518003a3f790ad9510b20711ade597a51b0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 25 11:46:42 2014 +0100
Automatic commit of package [SatConfig-cluster] release [2.2.2-1].
diff --git a/monitoring/SatConfig/cluster/SatConfig-cluster.spec b/monitoring/SatConfig/cluster/SatConfig-cluster.spec
index 7302cdc..e48c819 100644
--- a/monitoring/SatConfig/cluster/SatConfig-cluster.spec
+++ b/monitoring/SatConfig/cluster/SatConfig-cluster.spec
@@ -1,6 +1,6 @@
%define sysv_dir %{_sysconfdir}/rc.d/np.d
Name: SatConfig-cluster
-Version: 2.2.1
+Version: 2.2.2
Release: 1%{?dist}
Summary: Satellite Configuration System - cluster information
URL: https://fedorahosted.org/spacewalk
@@ -56,6 +56,9 @@ install -m 644 SatCluster.pm $RPM_BUILD_ROOT%{perl_vendorlib}/NOCpulse/
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Feb 25 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.2.2-1
+- 1069332 - fixing ip syntax
+
* Tue Feb 25 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.2.1-1
- 1069332 - simplify regexp
- 1069332 - Use /sbin/ip instead of /sbin/ifconfig.
diff --git a/rel-eng/packages/SatConfig-cluster b/rel-eng/packages/SatConfig-cluster
index a14d2cc..61abcbf 100644
--- a/rel-eng/packages/SatConfig-cluster
+++ b/rel-eng/packages/SatConfig-cluster
@@ -1 +1 @@
-2.2.1-1 monitoring/SatConfig/cluster/
+2.2.2-1 monitoring/SatConfig/cluster/
commit 449db5258269a6a6fc0e205af44d7f36c382db60
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 25 11:45:12 2014 +0100
1069332 - fixing ip syntax
diff --git a/monitoring/SatConfig/cluster/IpAddr.pm b/monitoring/SatConfig/cluster/IpAddr.pm
index 91c23c7..da4e920 100644
--- a/monitoring/SatConfig/cluster/IpAddr.pm
+++ b/monitoring/SatConfig/cluster/IpAddr.pm
@@ -96,7 +96,7 @@ sub macAddress
{
my $self = shift();
my $dev = $self->get_dev;
- my $mac = `/sbin/ip -o link $dev`;
+ my $mac = `/sbin/ip -o link show $dev`;
if ($mac =~ /ether (\S*)/m) {
return $1;
} else {
10 years, 2 months
Changes to 'refs/tags/SatConfig-cluster-2.2.1-1'
by Michael Mraka
Tag 'SatConfig-cluster-2.2.1-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-02-25 10:10 +0000
Tagging package [SatConfig-cluster] version [2.2.1-1] in directory [monitoring/SatConfig/cluster/].
Changes since MessageQueue-3.26.10-1:
Michael Mraka (1):
Automatic commit of package [SatConfig-cluster] release [2.2.1-1].
---
monitoring/SatConfig/cluster/SatConfig-cluster.spec | 6 +++++-
rel-eng/packages/SatConfig-cluster | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
10 years, 2 months