client/tools
by Milan Zazrivec
client/tools/rhn-virtualization/virtualization/poller.py | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit 6e63208ef8dee9df453fa97c3813517770de1e02
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Jan 28 22:12:03 2010 +0100
548812 - include host info in the virt. guests refresh
diff --git a/client/tools/rhn-virtualization/virtualization/poller.py b/client/tools/rhn-virtualization/virtualization/poller.py
index bfe7953..f93b846 100644
--- a/client/tools/rhn-virtualization/virtualization/poller.py
+++ b/client/tools/rhn-virtualization/virtualization/poller.py
@@ -32,6 +32,7 @@ from virtualization.errors import VirtualizationException
from virtualization.constants import StateType, \
PropertyType, \
VirtualizationType, \
+ IdentityType, \
VIRT_STATE_NAME_MAP, \
VIRT_VDSM_STATUS_MAP
from virtualization.notification import Plan, \
@@ -232,6 +233,12 @@ def _send_notifications(poller_state):
plan = Plan()
+ # Declare virtualization host first
+ plan.add(EventType.EXISTS,
+ TargetType.SYSTEM,
+ { PropertyType.IDENTITY : IdentityType.HOST,
+ PropertyType.UUID : '0000000000000000' })
+
for (uuid, data) in added.items():
plan.add(EventType.EXISTS, TargetType.DOMAIN, data)
14 years, 4 months
client/rhel
by Milan Zazrivec
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 23 +++++++-----
1 file changed, 15 insertions(+), 8 deletions(-)
New commits:
commit 721cb43a480c8ad344aabc8504344b8168fb8a9d
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Jan 28 19:27:47 2010 +0100
557370 - clear dmi warnings for xen pv guests
Handling & clearing dmi warnings for module imports only is not
sufficient. dmidecode module may produce warning messages during
arbitrary module calls (e.g. when run on a Xen paravirtualized guest).
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
index 3f444c3..e5f045d 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -93,14 +93,6 @@ PCI_CLASS_SERIAL_USB = 3
PCI_CLASS_SERIAL_FIBER = 4
PCI_CLASS_SERIAL_SMBUS = 5
-dmi_warnings = None
-if hasattr(dmidecode, 'get_warnings'):
- dmi_warnings = dmidecode.get_warnings()
-
-if dmi_warnings:
- log = up2dateLog.initLog()
- log.log_debug("Warnings collected during dmidecode import: %s" % dmi_warnings)
-
# Some systems don't have the _locale module installed
try:
import locale
@@ -111,6 +103,18 @@ except ImportError:
_dmi_data = None
_dmi_not_available = 0
+def dmi_warnings():
+ if not hasattr(dmidecode, 'get_warnings'):
+ return None
+
+ return dmidecode.get_warnings()
+
+dmi_warn = dmi_warnings()
+if dmi_warn:
+ dmidecode.clear_warnings()
+ log = up2dateLog.initLog()
+ log.log_debug("Warnings collected during dmidecode import: %s" % dmi_warn)
+
def _initialize_dmi_data():
""" Initialize _dmi_data unless it already exist and returns it """
global _dmi_data, _dmi_not_available
@@ -127,6 +131,9 @@ def _initialize_dmi_data():
except:
# DMI decode FAIL, this can happend e.g in PV guest
_dmi_not_available = 1
+ dmi_warn = dmi_warnings()
+ if dmi_warn:
+ dmidecode.clear_warnings()
return None
_dmi_data = data.xpathNewContext();
return _dmi_data
14 years, 4 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 25 ++++++++--
java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java | 12 ++++
2 files changed, 34 insertions(+), 3 deletions(-)
New commits:
commit 3dcc601181e12b62e0c9c55b474544e52a3a4f75
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Jan 28 12:08:08 2010 -0500
538435 - fixing issue where cloning a channel wouldnt properly clone the activation keys, and wouldnt update the default session key properly
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index 41363e6..9cde4a6 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -21,9 +21,12 @@ import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.common.FileList;
import com.redhat.rhn.domain.kickstart.crypto.CryptoKey;
import com.redhat.rhn.domain.org.Org;
+import com.redhat.rhn.domain.token.ActivationKey;
+import com.redhat.rhn.domain.token.ActivationKeyFactory;
import com.redhat.rhn.domain.token.Token;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.kickstart.KickstartFormatter;
+import com.redhat.rhn.manager.kickstart.KickstartSessionCreateCommand;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerCommand;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
@@ -1227,9 +1230,7 @@ public class KickstartData {
cloned.setCryptoKeys(new HashSet(this.getCryptoKeys()));
}
- if (this.getDefaultRegTokens() != null) {
- cloned.setDefaultRegTokens(new HashSet(this.getDefaultRegTokens()));
- }
+
// NOTE: Make sure we *DONT* clone isOrgDefault
cloned.setIsOrgDefault(Boolean.FALSE);
@@ -1256,6 +1257,24 @@ public class KickstartData {
cloned.addScript(ksscloned);
}
}
+
+ //copy all of the non-session related kickstarts
+ Set<Token> newTokens = new HashSet<Token>();
+ if (this.getDefaultRegTokens() != null) {
+ for (Token tok : this.getDefaultRegTokens()) {
+ ActivationKey key = ActivationKeyFactory.lookupByToken(tok);
+ if (key == null || key.getKickstartSession() == null) {
+ newTokens.add(tok);
+ }
+ }
+ }
+ cloned.setDefaultRegTokens(newTokens);
+
+ //create a new session one
+ KickstartSessionCreateCommand cmd = new KickstartSessionCreateCommand(
+ user.getOrg(), cloned);
+ cmd.store();
+
}
// Helper method to copy KickstartCommands
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java
index a0a45f5..9baa1e3 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java
@@ -25,6 +25,9 @@ import com.redhat.rhn.domain.kickstart.KickstartableTree;
import com.redhat.rhn.domain.kickstart.RepoInfo;
import com.redhat.rhn.domain.kickstart.builder.KickstartBuilder;
import com.redhat.rhn.domain.org.Org;
+import com.redhat.rhn.domain.token.ActivationKey;
+import com.redhat.rhn.domain.token.ActivationKeyFactory;
+import com.redhat.rhn.domain.token.Token;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.channel.ChannelManager;
@@ -202,6 +205,15 @@ public class KickstartEditCommand extends BaseKickstartCommand {
KickstartableTree tree = KickstartFactory.findTreeById(treeId, orgId);
KickstartWizardHelper helper = new KickstartWizardHelper(getUser());
+
+
+ for (Token token : ksdata.getDefaultRegTokens()) {
+ ActivationKey key = ActivationKeyFactory.lookupByToken(token);
+ if (key != null && key.getKickstartSession() != null) {
+ token.setBaseChannel(tree.getChannel());
+ }
+ }
+
if (tree != null) {
this.ksdata.getKickstartDefaults().setKstree(tree);
14 years, 4 months
backend/server
by Jan Pazdziora
backend/server/importlib/backend.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7de2157c76e530296815fdfbbb4d9db88c7f9597
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 22 10:49:42 2010 +0100
545389 - initial satellite-sync performance issue -- force use of index.
diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py
index 89d7eac..a56c067 100644
--- a/backend/server/importlib/backend.py
+++ b/backend/server/importlib/backend.py
@@ -84,7 +84,7 @@ class Backend:
def processCapabilities(self, capabilityHash):
# First figure out which capabilities are already inserted
templ = """
- select id
+ select /*+index(rhnPackageCapability rhn_pkg_cap_name_version_uq)*/ id
from rhnPackageCapability
where name = :name
and version %s"""
14 years, 4 months
web/modules
by Jan Pazdziora
web/modules/pxt/PXT/ApacheHandler.pm | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
New commits:
commit 51fd1c7065c69659d811c70d4f233f08fe2bfb41
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 28 14:16:18 2010 +0100
No XMLRPC/SOAP processing in the web/Perl stack, removing.
diff --git a/web/modules/pxt/PXT/ApacheHandler.pm b/web/modules/pxt/PXT/ApacheHandler.pm
index b8d2433..82f2d5d 100644
--- a/web/modules/pxt/PXT/ApacheHandler.pm
+++ b/web/modules/pxt/PXT/ApacheHandler.pm
@@ -363,28 +363,15 @@ sub initialize_pxt {
my $xml_req;
my $status; # status from call to $apr->parse
- if ($r->headers_in->{"Content-type"} and $r->headers_in->{"Content-type"} =~ m(^text/xml)) {
- $xml_req = 1;
- $apr = undef;
+ $apr = Apache2::Request->new($r, POST_MAX => PXT::Config->get("post_max"));
- if ($r->headers_in->{'SOAPAction'}) {
- $request->xml_request(new PXT::SoapRequest);
- }
- else {
- $request->xml_request(new PXT::XmlrpcRequest);
- }
- }
- else {
- $apr = Apache2::Request->new($r, POST_MAX => PXT::Config->get("post_max"));
-
- $status = OK;
- eval {
+ $status = OK;
+ eval {
$apr->parse;
- };
- if ($@ and ref $@ eq 'APR::Request::Error') {
+ };
+ if ($@ and ref $@ eq 'APR::Request::Error') {
APR::Request::Error::strerror($@);
$status = SERVER_ERROR;
- }
}
$r->pnotes('pxt_apr', $apr);
14 years, 4 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/common/security/acl/BaseHandler.java | 11 ++++++++++
java/code/webapp/WEB-INF/nav/channel_tabs.xml | 2 -
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 2 -
3 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 2a215ec3108e53f6b977bb705f6152a0cc50dbc1
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Jan 27 18:42:50 2010 -0500
506950 - fixing issue where RedHat channels tab would show up for spacewalk users
diff --git a/java/code/src/com/redhat/rhn/common/security/acl/BaseHandler.java b/java/code/src/com/redhat/rhn/common/security/acl/BaseHandler.java
index 6c214fe..c7db4f3 100644
--- a/java/code/src/com/redhat/rhn/common/security/acl/BaseHandler.java
+++ b/java/code/src/com/redhat/rhn/common/security/acl/BaseHandler.java
@@ -44,6 +44,17 @@ public abstract class BaseHandler implements AclHandler {
/**
+ * returns true if satellite, false if spacewalk
+ * @param ctx Our current context, containing a crid or cfid.
+ * @param params nothing
+ * @return true if satellite, false if spacewalk
+ */
+ public boolean aclIsSatellite(Object ctx, String[] params) {
+ return !ConfigDefaults.get().isSpacewalk();
+ }
+
+
+ /**
* Returns a Long object from the given object. We expect
* a String[] or String as the input all others return null;
* @param o object to be converted
diff --git a/java/code/webapp/WEB-INF/nav/channel_tabs.xml b/java/code/webapp/WEB-INF/nav/channel_tabs.xml
index 3eb4942..3a18a55 100644
--- a/java/code/webapp/WEB-INF/nav/channel_tabs.xml
+++ b/java/code/webapp/WEB-INF/nav/channel_tabs.xml
@@ -4,7 +4,7 @@
<rhn-tab name="channel.nav.all">
<rhn-tab-url>/rhn/software/channels/All.do</rhn-tab-url>
</rhn-tab>
- <rhn-tab name="channel.nav.redhat">
+ <rhn-tab name="channel.nav.redhat" acl="is_satellite()">
<rhn-tab-url>/rhn/software/channels/RedHat.do</rhn-tab-url>
</rhn-tab>
<rhn-tab name="channel.nav.popular">
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index a427be3..daa0725 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -126,7 +126,7 @@
<rhn-tab name="Software Channels" url="/rhn/software/channels/All.do">
<rhn-tab-directory>/rhn/channels</rhn-tab-directory>
<rhn-tab name="channel.nav.all" url="/rhn/software/channels/All.do"/>
- <rhn-tab name="channel.nav.redhat" url="/rhn/software/channels/RedHat.do"/>
+ <rhn-tab name="channel.nav.redhat" url="/rhn/software/channels/RedHat.do" acl="is_satellite()"/>
<rhn-tab name="channel.nav.popular" url="/rhn/software/channels/Popular.do"/>
<rhn-tab name="channel.nav.custom" url="/rhn/software/channels/Custom.do"/>
<rhn-tab name="channel.nav.shared" url="/rhn/software/channels/Shared.do"/>
14 years, 4 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 9 +++++++++
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 4f0f5c6c059ff85c6d032766966a52288f59c7e1
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Jan 27 18:01:21 2010 -0500
fixing issue that kept spacewalk from working with the newest cobbler
diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
index ea255b8..75288b0 100644
--- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
+++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
@@ -390,6 +390,15 @@ public class ConfigDefaults {
}
/**
+ * get the text to print at the top of a kickstart template
+ * @return the header
+ */
+ public String getKickstartTemplateHeader() {
+ return Config.get().getString("kickstart.header", "#errorCatcher ListErrors");
+ }
+
+
+ /**
* Returns the default network interface for a kickstart profile
* @return the network interface
*/
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
index 66e5921..b1ffa27 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -254,7 +254,7 @@ public class KickstartFormatter {
*/
private StringBuffer getHeader() {
StringBuffer header = new StringBuffer();
- header.append("#errorCatcher Echo").append(NEWLINE);
+ header.append(ConfigDefaults.get().getKickstartTemplateHeader()).append(NEWLINE);
header.append(HEADER);
header.append(COMMENT);
header.append("# Profile Label : " + this.ksdata.getLabel() + NEWLINE);
14 years, 4 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ffa324a00da32cb747df0fedd215fb8f32cc295c
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Jan 27 16:34:51 2010 -0500
559284 - fixing issue where _ & - characters were being removed from cobbler names
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java
index 44818b5..27f603c 100755
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java
@@ -123,13 +123,13 @@ public abstract class CobblerCommand {
* @return the cobbler name.
*/
public static String makeCobblerName(String label, Org org) {
- label = label.replaceAll("[^a-zA-Z0-9]", "").replace(' ', '_');
+ label = label.replace(' ', '_').replaceAll("[^a-zA-Z0-9_-]", "");
if (org == null) {
return label;
}
- String orgName = org.getName().replaceAll("[^a-zA-Z0-9]", "").replace(' ', '_');
+ String orgName = org.getName().replaceAll("[^a-zA-Z0-9_-]", "").replace(' ', '_');
String format = "%s:%s:%s";
return String.format(format, label, org.getId(), orgName);
14 years, 4 months
Changes to 'refs/tags/spacewalk-java-0.8.8-1'
by Justin Sherrill
Tag 'spacewalk-java-0.8.8-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-01-27 21:03 +0000
Tagging package [spacewalk-java] version [0.8.8-1] in directory [java/].
Changes since spacewalk-java-0.8.7-1:
Justin Sherrill (2):
fixing api doc
Automatic commit of package [spacewalk-java] release [0.8.8-1].
Michael Mraka (1):
rhel5.2 wants 'sha1' checksum labeled 'sha'
---
backend/server/repomd/view.py | 5 ++++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 4 ++--
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
---
14 years, 4 months
java/spacewalk-java.spec rel-eng/packages
by Justin Sherrill
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit b26048c227b6bbe9129eaed7a3512eab853f6fb3
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Jan 27 16:03:30 2010 -0500
Automatic commit of package [spacewalk-java] release [0.8.8-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c940aaa..9c4b9d5 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.8.7
+Version: 0.8.8
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -283,6 +283,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Jan 27 2010 Justin Sherrill <jsherril(a)redhat.com> 0.8.8-1
+- fixing api doc (jsherril(a)redhat.com)
+
* Wed Jan 27 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.7-1
- 529460 - fixing detection of disconnected satellite
- 530177 - moving cobbler snippet usage before user %post scripts
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 7043e52..dcd1af4 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.8.7-1 java/
+0.8.8-1 java/
14 years, 4 months