Changes to 'refs/tags/spacewalk-jpp-workaround-1.0.2-1'
by Tomas Lestach
Tag 'spacewalk-jpp-workaround-1.0.2-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-07-13 09:02 +0000
Tagging package [spacewalk-jpp-workaround] version [1.0.2-1] in directory [spec-tree/spacewalk-jpp-workaround/].
Changes since spacewalk-schema-1.8.60-1:
Jan Pazdziora (1):
771749 - if the exception is <type 'instance'>, just plain if will fail.
Tomas Lestach (3):
checkstyle fix
let our workaround package provide struts-taglib and struts-tiles for fc17
Automatic commit of package [spacewalk-jpp-workaround] release [1.0.2-1].
---
client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py | 2 -
java/code/src/com/redhat/rhn/manager/kickstart/tree/BaseTreeEditOperation.java | 10 ++++-----
rel-eng/packages/spacewalk-jpp-workaround | 2 -
spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec | 11 +++++++++-
4 files changed, 17 insertions(+), 8 deletions(-)
---
11 years, 9 months
2 commits - rel-eng/packages spec-tree/spacewalk-jpp-workaround
by Tomas Lestach
rel-eng/packages/spacewalk-jpp-workaround | 2 -
spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec | 11 +++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit d4a63e1dfca0c6bf159f3fb1a37e2e08e47c64dc
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jul 13 11:02:02 2012 +0200
Automatic commit of package [spacewalk-jpp-workaround] release [1.0.2-1].
diff --git a/rel-eng/packages/spacewalk-jpp-workaround b/rel-eng/packages/spacewalk-jpp-workaround
index ee2e00f..2384e2b 100644
--- a/rel-eng/packages/spacewalk-jpp-workaround
+++ b/rel-eng/packages/spacewalk-jpp-workaround
@@ -1 +1 @@
-1.0.1-1 spec-tree/spacewalk-jpp-workaround/
+1.0.2-1 spec-tree/spacewalk-jpp-workaround/
diff --git a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
index 71c3dbd..83114da 100644
--- a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
+++ b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
@@ -1,5 +1,5 @@
Name: spacewalk-jpp-workaround
-Version: 1.0.1
+Version: 1.0.2
Release: 1%{?dist}
Summary: Workaround package to fulfill jpackage broken dependencies
@@ -56,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jul 13 2012 Tomas Lestach <tlestach(a)redhat.com> 1.0.2-1
+- let our workaround package provide struts-taglib and struts-tiles for fc17
+- %%defattr is not needed since rpm 4.4
+
* Thu Dec 15 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.0.1-1
- take msv out of yum transaction
commit 51559579fd0bba21a27dc6ab3148c7fd40318b0b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jul 13 10:36:44 2012 +0200
let our workaround package provide struts-taglib and struts-tiles for fc17
- fc17 struts contains also taglib and tiles
- fc17 struts has higher version than the jpp package
- struts-taglib and struts-tiles are required by velocity-tools (a sitemesh dependency from jpp)
diff --git a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
index ec6f95f..71c3dbd 100644
--- a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
+++ b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
@@ -29,6 +29,11 @@ Provides: spring = 1:1.2.9.0
Obsoletes: spring < 1:1.2.9.0
%endif
+%if 0%{?fedora} && 0%{fedora} >= 17
+Provides: struts-taglib = 1.3.8
+Provides: struts-tiles = 1.3.8
+%endif
+
%description
This package fulfills jpackage missing msv-msv dependency.
11 years, 9 months
client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7fc29208a8b8e00f8333709a0e0f4dc63c8269d9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 13 10:09:20 2012 +0200
771749 - if the exception is <type 'instance'>, just plain if will fail.
Addressing
Traceback (most recent call last):
File "/tmp/rhn-channel", line 121, in ?
systemExit(1, e)
File "/tmp/rhn-channel", line 25, in systemExit
if msgs:
TypeError: 'NoneType' object is not callable
diff --git a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
index 80872d6..ea4e382 100644
--- a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
+++ b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
@@ -39,7 +39,7 @@ from up2date_client import up2dateAuth, config, up2dateErrors, rhncli
def systemExit(code, msgs=None):
"Exit with a code and optional message(s). Saved a few lines of code."
- if msgs:
+ if msgs is not None:
if type(msgs) not in [type([]), type(())]:
msgs = (msgs, )
for msg in msgs:
11 years, 9 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/manager/kickstart/tree/BaseTreeEditOperation.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 3b8f37670e91048123fa8dbcdc081eaa271b4661
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jul 13 08:07:19 2012 +0200
checkstyle fix
addressing:
Name 'xen_distro' must match pattern '^[a-z][a-zA-Z0-9]*$'.
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/tree/BaseTreeEditOperation.java b/java/code/src/com/redhat/rhn/manager/kickstart/tree/BaseTreeEditOperation.java
index 9f5b053..5a48b20 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/tree/BaseTreeEditOperation.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/tree/BaseTreeEditOperation.java
@@ -95,17 +95,17 @@ public abstract class BaseTreeEditOperation extends BasePersistOperation {
Distro distro = Distro.lookupById(CobblerXMLRPCHelper.getConnection(
this.getUser()), tree.getCobblerId());
- Distro xen_distro = Distro.lookupById(CobblerXMLRPCHelper.getConnection(
+ Distro xenDistro = Distro.lookupById(CobblerXMLRPCHelper.getConnection(
this.getUser()), tree.getCobblerXenId());
Map kOpts = distro.getKernelOptions();
distro.setKernelOptions(getKernelOptions());
distro.setKernelPostOptions(getPostKernelOptions());
distro.save();
- if (xen_distro != null) {
- xen_distro.setKernelOptions(getKernelOptions());
- xen_distro.setKernelPostOptions(getPostKernelOptions());
- xen_distro.save();
+ if (xenDistro != null) {
+ xenDistro.setKernelOptions(getKernelOptions());
+ xenDistro.setKernelPostOptions(getPostKernelOptions());
+ xenDistro.save();
}
}
catch (XmlRpcException xe) {
11 years, 9 months
Changes to 'refs/tags/spacewalk-schema-1.8.60-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.8.60-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-07-13 05:09 +0000
Tagging package [spacewalk-schema] version [1.8.60-1] in directory [schema/spacewalk/].
Changes since rhn-client-tools-1.8.13-1:
Jan Pazdziora (2):
Add the PostgreSQL specific mad_address upgrade script.
Automatic commit of package [spacewalk-schema] release [1.8.60-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/109-rhnactionkickstartguest_mac_address_column_add.sql | 1 -
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/109-rhnactionkickstartguest_mac_address_column_add.sql.oracle | 1 +
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/109-rhnactionkickstartguest_mac_address_column_add.sql.postgresql | 2 ++
5 files changed, 8 insertions(+), 3 deletions(-)
---
11 years, 9 months
2 commits - rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/109-rhnactionkickstartguest_mac_address_column_add.sql | 1 -
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/109-rhnactionkickstartguest_mac_address_column_add.sql.oracle | 1 +
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/109-rhnactionkickstartguest_mac_address_column_add.sql.postgresql | 2 ++
5 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit c88e5418a70c3e6c78444f6fcb901c3bdffd6c99
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 13 07:09:14 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.60-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 4537d4d..74c3bbb 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.59-1 schema/spacewalk/
+1.8.60-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 45d5263..dc8f6ba 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.8.59
+Version: 1.8.60
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Jul 13 2012 Jan Pazdziora 1.8.60-1
+- Add the PostgreSQL specific mad_address upgrade script.
+
* Tue Jul 10 2012 Stephen Herr <sherr(a)redhat.com> 1.8.59-1
- 836656 - Also add new column to initial table creation
commit a71f95e157f44d2fe9a715a052aab1f87c9ab52b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 13 07:08:52 2012 +0200
Add the PostgreSQL specific mad_address upgrade script.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/109-rhnactionkickstartguest_mac_address_column_add.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/109-rhnactionkickstartguest_mac_address_column_add.sql
deleted file mode 100644
index 0908b72..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/109-rhnactionkickstartguest_mac_address_column_add.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table rhnactionkickstartguest add mac_address varchar2(17);
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/109-rhnactionkickstartguest_mac_address_column_add.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/109-rhnactionkickstartguest_mac_address_column_add.sql.oracle
new file mode 100644
index 0000000..0908b72
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/109-rhnactionkickstartguest_mac_address_column_add.sql.oracle
@@ -0,0 +1 @@
+alter table rhnactionkickstartguest add mac_address varchar2(17);
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/109-rhnactionkickstartguest_mac_address_column_add.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/109-rhnactionkickstartguest_mac_address_column_add.sql.postgresql
new file mode 100644
index 0000000..c5fcf47
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/109-rhnactionkickstartguest_mac_address_column_add.sql.postgresql
@@ -0,0 +1,2 @@
+-- oracle equivalent source sha1 10095aa2d1ddf9071641c7977a197c7320ec7b39
+alter table rhnactionkickstartguest add mac_address varchar(17);
11 years, 9 months
Changes to 'refs/tags/rhn-client-tools-1.8.13-1'
by StephenHerr
Tag 'rhn-client-tools-1.8.13-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-07-12 20:14 +0000
Tagging package [rhn-client-tools] version [1.8.13-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-java-1.8.107-1:
Stephen Herr (3):
839776 - rhn-profile-sync exits with status 1 if libvirtd is not running
Automatic commit of package [rhn-virtualization] release [5.4.37-1].
Automatic commit of package [rhn-client-tools] release [1.8.13-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 7 +++++--
client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py | 2 +-
client/tools/rhn-virtualization/rhn-virtualization.spec | 5 ++++-
client/tools/rhn-virtualization/virtualization/support.py | 8 +++++---
rel-eng/packages/rhn-client-tools | 2 +-
rel-eng/packages/rhn-virtualization | 2 +-
6 files changed, 17 insertions(+), 9 deletions(-)
---
11 years, 9 months
client/rhel rel-eng/packages
by StephenHerr
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 237e12ac442f44410d3cf234c8f36231cdd32078
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Jul 12 16:14:02 2012 -0400
Automatic commit of package [rhn-client-tools] release [1.8.13-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index ed208c2..b9a6ca7 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.8.12
+Version: 1.8.13
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -339,6 +339,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Thu Jul 12 2012 Stephen Herr <sherr(a)redhat.com> 1.8.13-1
+- 839776 - rhn-profile-sync exits with status 1 if libvirtd is not running
+
* Tue Jul 10 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.12-1
- Add missing space to log message
- Fix missing exception scope
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 94b15f1..6dc1914 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.8.12-1 client/rhel/rhn-client-tools/
+1.8.13-1 client/rhel/rhn-client-tools/
11 years, 9 months
Changes to 'refs/tags/rhn-virtualization-5.4.37-1'
by StephenHerr
Tag 'rhn-virtualization-5.4.37-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-07-12 20:11 +0000
Tagging package [rhn-virtualization] version [5.4.37-1] in directory [client/tools/rhn-virtualization/].
Changes since spacewalk-backend-1.8.48-1:
Stephen Herr (2):
839776 - rhn-profile-sync exits with status 1 if libvirtd is not running
Automatic commit of package [rhn-virtualization] release [5.4.37-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 2 +-
client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py | 2 +-
client/tools/rhn-virtualization/rhn-virtualization.spec | 5 ++++-
client/tools/rhn-virtualization/virtualization/support.py | 8 +++++---
rel-eng/packages/rhn-virtualization | 2 +-
5 files changed, 12 insertions(+), 7 deletions(-)
---
11 years, 9 months
2 commits - client/rhel client/tools rel-eng/packages
by StephenHerr
client/rhel/rhn-client-tools/rhn-client-tools.spec | 2 +-
client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py | 2 +-
client/tools/rhn-virtualization/rhn-virtualization.spec | 5 ++++-
client/tools/rhn-virtualization/virtualization/support.py | 8 +++++---
rel-eng/packages/rhn-virtualization | 2 +-
5 files changed, 12 insertions(+), 7 deletions(-)
New commits:
commit 838e10ebce790bad0c1232ebdd78e24de2d8d951
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Jul 12 16:11:57 2012 -0400
Automatic commit of package [rhn-virtualization] release [5.4.37-1].
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec
index d1cc258..4a92102 100644
--- a/client/tools/rhn-virtualization/rhn-virtualization.spec
+++ b/client/tools/rhn-virtualization/rhn-virtualization.spec
@@ -10,7 +10,7 @@ License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.4.36
+Version: 5.4.37
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -147,6 +147,9 @@ fi
%doc LICENSE
%changelog
+* Thu Jul 12 2012 Stephen Herr <sherr(a)redhat.com> 5.4.37-1
+- 839776 - rhn-profile-sync exits with status 1 if libvirtd is not running
+
* Mon Jun 04 2012 Miroslav Suchý <msuchy(a)redhat.com> 5.4.36-1
- Add support for studio image deployments (client) (jrenner(a)suse.de)
- %%defattr is not needed since rpm 4.4 (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/rhn-virtualization b/rel-eng/packages/rhn-virtualization
index 46514a6..458d577 100644
--- a/rel-eng/packages/rhn-virtualization
+++ b/rel-eng/packages/rhn-virtualization
@@ -1 +1 @@
-5.4.36-1 client/tools/rhn-virtualization/
+5.4.37-1 client/tools/rhn-virtualization/
commit 75d403e1d5b463635e64336dc466b32b85d980cc
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Jul 12 16:11:05 2012 -0400
839776 - rhn-profile-sync exits with status 1 if libvirtd is not running
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index e11133d..ed208c2 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -50,7 +50,7 @@ Conflicts: yum-rhn-plugin < 1.6.4-1
Conflicts: rhncfg < 5.9.23-1
Conflicts: spacewalk-koan < 0.2.7-1
Conflicts: rhn-kickstart < 5.4.3-1
-Conflicts: rhn-virtualization < 5.4.14-1
+Conflicts: rhn-virtualization < 5.4.36-2
BuildRequires: python-devel
BuildRequires: gettext
diff --git a/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py b/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
index 2259770..ad8ebbb 100644
--- a/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
@@ -48,7 +48,7 @@ class ProfileCli(rhncli.RhnCli):
if support is not None:
print _("Updating virtualization profile...")
- support.refresh()
+ support.refresh(True)
if __name__ == "__main__":
diff --git a/client/tools/rhn-virtualization/virtualization/support.py b/client/tools/rhn-virtualization/virtualization/support.py
index f6f72ab..b6748bf 100755
--- a/client/tools/rhn-virtualization/virtualization/support.py
+++ b/client/tools/rhn-virtualization/virtualization/support.py
@@ -54,12 +54,12 @@ vdsm_enabled = _check_status("vdsmd")
# Public Interface
###############################################################################
-def refresh():
+def refresh(fail_on_error=False):
"""
Refreshes the virtualization info for this host and any subdomains on the
server.
"""
- if _is_host_domain():
+ if _is_host_domain(fail_on_error):
domain_identity = IdentityType.HOST
my_uuid = _fetch_host_uuid()
else:
@@ -170,7 +170,7 @@ def schedulePoller(minute, hour, dom, month, dow):
# Helper Routines
###############################################################################
-def _is_host_domain():
+def _is_host_domain(fail_on_error=False):
"""
This function returns true if this system is currently a host domain.
Simply having virtualization enabled is sufficient.
@@ -188,6 +188,8 @@ def _is_host_domain():
conn = libvirt.openReadOnly(None)
except libvirt.libvirtError: # libvirtd is not running
sys.stderr.write(rhncli.utf8_encode(_("Warning: Could not retrieve virtualization information!\n\tlibvirtd service needs to be running.\n")))
+ if fail_on_error:
+ exit(1)
return False
if conn and conn.getType() in ['Xen', 'QEMU']:
return True
11 years, 9 months