client/tools
by Justin Sherrill
client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/README | 12 +++++-----
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 2e0ef3a683291e3fa9a6a8b8bc7a1a2f9a583e6e
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Sep 30 13:56:14 2010 -0400
updating readme for spacewalk-create-channel
diff --git a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/README b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/README
index 4f632b0..42dcfa7 100644
--- a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/README
+++ b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/doc/README
@@ -1,25 +1,25 @@
-Create channel to update level
+spacewalk-create-channel
by Justin Sherrill (jsherril(a)redhat.com)
This script can create a channel to a specific update level (i.e. RHEL4u3) or upgrade an existing channel to a higher update level on an RHN Satellite or Spacewalk server.
-For help, simply run ./create-channel-update --help
+For help, simply run spacewalk-create-channel --help
Examples
-------
Create channel 'my-stable-channel' for RHEL 4 AS u3 i386:
-./create-channel-update -l admin -s myserver.example.com -v 4 -u u3 -r AS -a i386 -d my-stable-channel
+spacewalk-create-channel -l admin -s myserver.example.com -v 4 -u u3 -r AS -a i386 -d my-stable-channel
or another way:
-./create-channel-update -l admin -s myserver.example.com -D ./data/4-U3-AS-i386 -d my-stable-channel
+spacewalk-create-channel -l admin -s myserver.example.com -D ./data/4-U3-AS-i386 -d my-stable-channel
Upgrade prevously created channel 'my-stable-channel' to RHEL 4 AS u4 i386:
-./create-channel-update -l admin -s myserver.example.com -v 4 -u u4 -r AS -a i386 -d my-stable-channel
+spacewalk-create-channel -l admin -s myserver.example.com -v 4 -u u4 -r AS -a i386 -d my-stable-channel
Add the extra's channel as a child channel of 'my-stable-channel':
-./create-channel-update -l admin -s myserver.example.com -v 4 -u u4 -r AS -a i386 -e extras -p my-stable-channel
+spacewalk-create-channel -l admin -s myserver.example.com -v 4 -u u4 -r AS -a i386 -e extras -p my-stable-channel
Skip List
12 years, 8 months
Changes to 'refs/tags/spacewalk-remote-utils-1.0.3-1'
by Justin Sherrill
Tag 'spacewalk-remote-utils-1.0.3-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-09-30 17:52 +0000
Tagging package [spacewalk-remote-utils] version [1.0.3-1] in directory [client/tools/spacewalk-remote-utils/].
Changes since spacewalk-schema-1.2.24-1:
Jan Pazdziora (1):
get_obsoletes_blacklist is not called by our code, removing as dead code.
Justin Sherrill (2):
updating spacewalk-remote-utils man page to remove left over bits from copied spec
Automatic commit of package [spacewalk-remote-utils] release [1.0.3-1].
---
backend/server/rhnChannel.py | 61 ----------
client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec | 10 +
rel-eng/packages/spacewalk-remote-utils | 2
3 files changed, 8 insertions(+), 65 deletions(-)
---
12 years, 8 months
client/tools rel-eng/packages
by Justin Sherrill
client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec | 6 +++++-
rel-eng/packages/spacewalk-remote-utils | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 371954c392de0370fdc0b4a26a0825d5848cd917
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Sep 30 13:52:53 2010 -0400
Automatic commit of package [spacewalk-remote-utils] release [1.0.3-1].
diff --git a/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec b/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
index 9a0ba99..594b1c8 100644
--- a/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
+++ b/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
@@ -4,7 +4,7 @@
%endif
Name: spacewalk-remote-utils
-Version: 1.0.2
+Version: 1.0.3
Release: 1%{?dist}
Summary: Utilities to interact with a Satellite or Spacewalk server remotely.
@@ -52,6 +52,10 @@ docbook2man ./spacewalk-create-channel/doc/spacewalk-create-channel.sgml -o ./sp
%doc %{_mandir}/man1/spacecwalk-create-channel.1.gz
%changelog
+* Thu Sep 30 2010 Justin Sherrill <jsherril(a)redhat.com> 1.0.3-1
+- updating spacewalk-remote-utils man page to remove left over bits from copied
+ spec (jsherril(a)redhat.com)
+
* Mon Sep 20 2010 Shannon Hughes <shughes(a)redhat.com> 1.0.2-1
- adding docbook-utils build require (shughes(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-remote-utils b/rel-eng/packages/spacewalk-remote-utils
index cfe69c0..904be1a 100644
--- a/rel-eng/packages/spacewalk-remote-utils
+++ b/rel-eng/packages/spacewalk-remote-utils
@@ -1 +1 @@
-1.0.2-1 client/tools/spacewalk-remote-utils/
+1.0.3-1 client/tools/spacewalk-remote-utils/
12 years, 8 months
client/tools
by Justin Sherrill
client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f3dd31745547bb06144602b36b97b345e8763461
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Sep 30 13:52:13 2010 -0400
updating spacewalk-remote-utils man page to remove left over bits from copied spec
diff --git a/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec b/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
index ae63e2d..9a0ba99 100644
--- a/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
+++ b/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
@@ -6,7 +6,7 @@
Name: spacewalk-remote-utils
Version: 1.0.2
Release: 1%{?dist}
-Summary: Command-line interface to Spacewalk and Satellite servers
+Summary: Utilities to interact with a Satellite or Spacewalk server remotely.
Group: Applications/System
License: GPLv3+
@@ -19,7 +19,7 @@ BuildRequires: python-devel
BuildRequires: docbook-utils
%description
-spacecmd is a command-line interface to Spacewalk and Satellite servers
+Utilities to interact with a Satellite or Spacewalk server remotely over XMLRPC.
%prep
%setup -q
12 years, 8 months
backend/server
by Jan Pazdziora
backend/server/rhnChannel.py | 61 -------------------------------------------
1 file changed, 61 deletions(-)
New commits:
commit 368944fcb919ff538e1858f4a887210e7b36fdda
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Sep 30 18:41:28 2010 +0200
get_obsoletes_blacklist is not called by our code, removing as dead code.
diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py
index dec0ca3..5a30821 100644
--- a/backend/server/rhnChannel.py
+++ b/backend/server/rhnChannel.py
@@ -1667,67 +1667,6 @@ def __auth_user(server_id, username, password):
raise rhnFault(37)
return 1
-# list the obsoletes blacklist for a channel
-def get_obsoletes_blacklist(channel):
- log_debug(3, channel)
-
- # try the caching thing first
- c_info = channel_info(channel)
- if not c_info: # unknown channel
- raise rhnFault(40, "could not find any data on channel '%s'" % channel)
- cache_entry = "blacklist_obsoletes-%s" % channel
- ret = rhnCache.get(cache_entry, c_info["last_modified"])
- if ret: # we scored a cache hit
- log_debug(4, "Scored cache hit", channel)
- return ret
-
- # Get the obsoleted packages
- h = rhnSQL.prepare("""
- select unique
- pnsrc.name src_name,
- bo.src_epoch,
- bo.src_version,
- bo.src_release,
- cdst.label dst_channel,
- pndst.name dst_name,
- bo.dst_epoch,
- bo.dst_version,
- bo.dst_release
- from
- rhnChannel csrc, rhnChannel cdst,
- rhnPackageName pnsrc, rhnPackageName pndst,
- rhnBlacklistObsoletes bo
- where bo.src_channel_id = csrc.id
- and csrc.label = :channel
- and bo.dst_channel_id = cdst.id (+)
- and bo.src_name_id = pnsrc.id
- and bo.dst_name_id = pndst.id
- order by pnsrc.name, pndst.name
- """)
- h.execute(channel = str(channel))
- result = []
- keys = ['name', 'version', 'release', 'epoch']
- while 1:
- row = h.fetchone_dict()
- if not row:
- break
- src = map(lambda k, row=row: row[k],
- map(lambda k: "src_" + k, keys))
- for i in [1, 2, 3]:
- if src[i] is None:
- src[i] = ''
- dst = map(lambda k, row=row: row[k],
- map(lambda k: "dst_" + k, keys))
- for i in [1, 2, 3]:
- if dst[i] is None:
- dst[i] = ''
- dst_channel = row['dst_channel'] or ''
- result.append([src, dst, dst_channel])
-
- # we can cache this now
- rhnCache.set(cache_entry, result, c_info["last_modified"])
- return result
-
# small wrapper around a PL/SQL function
def _subscribe_sql(server_id, channel_id, commit = 1):
12 years, 8 months
Changes to 'refs/tags/spacewalk-schema-1.2.24-1'
by Tomas Lestach
Tag 'spacewalk-schema-1.2.24-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2010-09-30 15:59 +0000
Tagging package [spacewalk-schema] version [1.2.24-1] in directory [schema/spacewalk/].
Changes since rhn-client-tools-1.2.8-1:
Jan Pazdziora (3):
Mark the Oracle source equivalents in our PostgreSQL source files.
Update copyright years.
Make schema-source-sanity-check.pl happy again.
Tomas Lestach (4):
distinguish spacewalk and satellite email body, when certificate expires
638893 - removing duplicate cert-check-bunch
checkstyle issue
Automatic commit of package [spacewalk-schema] release [1.2.24-1].
---
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml | 46 ++++++----
java/code/src/com/redhat/rhn/manager/action/ActionManager.java | 2
java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java | 22 +++-
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/data/rhnTaskoBunch.sql | 3
schema/spacewalk/oracle/data/rhnTaskoTemplate.sql | 7 -
schema/spacewalk/postgres/class/evr_t.sql | 4
schema/spacewalk/postgres/data/rhnArchTypeActions.sql | 4
schema/spacewalk/postgres/data/rhnBlacklistObsoletes.sql | 4
schema/spacewalk/postgres/data/rhnKickstartTimezone.sql | 4
schema/spacewalk/postgres/data/rhnTemplateString.sql | 4
schema/spacewalk/postgres/data/rhn_notification_formats.sql | 4
schema/spacewalk/postgres/data/rhn_schedule_days.sql | 2
schema/spacewalk/postgres/data/rhn_strategies.sql | 4
schema/spacewalk/postgres/procs/create_first_org.sql | 1
schema/spacewalk/postgres/procs/create_new_org.sql | 1
schema/spacewalk/postgres/procs/create_new_user.sql | 2
schema/spacewalk/postgres/procs/create_pxt_session.sql | 4
schema/spacewalk/postgres/procs/delete_channel.sql | 4
schema/spacewalk/postgres/procs/delete_errata.sql | 4
schema/spacewalk/postgres/procs/delete_server.sql | 4
schema/spacewalk/postgres/procs/delete_server_bulk.sql | 4
schema/spacewalk/postgres/procs/does_user_have_role.sql | 4
schema/spacewalk/postgres/procs/is_user_applicant.sql | 4
schema/spacewalk/postgres/procs/lookup_arch_type.sql | 4
schema/spacewalk/postgres/procs/lookup_cf_state.sql | 4
schema/spacewalk/postgres/procs/lookup_channel_arch.sql | 4
schema/spacewalk/postgres/procs/lookup_checksum.sql | 1
schema/spacewalk/postgres/procs/lookup_client_capability.sql | 4
schema/spacewalk/postgres/procs/lookup_config_filename.sql | 4
schema/spacewalk/postgres/procs/lookup_config_info.sql | 4
schema/spacewalk/postgres/procs/lookup_cve.sql | 4
schema/spacewalk/postgres/procs/lookup_erratafile_type.sql | 4
schema/spacewalk/postgres/procs/lookup_evr.sql | 4
schema/spacewalk/postgres/procs/lookup_feature_type.sql | 4
schema/spacewalk/postgres/procs/lookup_first_matching_cf.sql | 4
schema/spacewalk/postgres/procs/lookup_package_arch.sql | 4
schema/spacewalk/postgres/procs/lookup_package_capability.sql | 4
schema/spacewalk/postgres/procs/lookup_package_delta.sql | 4
schema/spacewalk/postgres/procs/lookup_package_key_type.sql | 4
schema/spacewalk/postgres/procs/lookup_package_name.sql | 4
schema/spacewalk/postgres/procs/lookup_package_nevra.sql | 4
schema/spacewalk/postgres/procs/lookup_package_provider.sql | 4
schema/spacewalk/postgres/procs/lookup_server_arch.sql | 4
schema/spacewalk/postgres/procs/lookup_sg_type.sql | 4
schema/spacewalk/postgres/procs/lookup_snapshot_invalid_reason.sql | 4
schema/spacewalk/postgres/procs/lookup_source_name.sql | 4
schema/spacewalk/postgres/procs/lookup_tag.sql | 4
schema/spacewalk/postgres/procs/lookup_tag_name.sql | 4
schema/spacewalk/postgres/procs/lookup_transaction_package.sql | 4
schema/spacewalk/postgres/procs/lookup_virt_sub_level.sql | 4
schema/spacewalk/postgres/procs/new_user_postop.sql | 4
schema/spacewalk/postgres/procs/pxt_session_cleanup.sql | 4
schema/spacewalk/postgres/procs/queue_errata.sql | 4
schema/spacewalk/postgres/procs/queue_server.sql | 4
schema/spacewalk/postgres/procs/rhn_install_org_satellites.sql | 4
schema/spacewalk/postgres/procs/rhn_install_satellite.sql | 4
schema/spacewalk/postgres/procs/rhn_prepare_install.sql | 2
schema/spacewalk/postgres/procs/rhn_synch_probe_state.sql | 4
schema/spacewalk/postgres/procs/sequence_currval.sql | 2
schema/spacewalk/postgres/procs/sequence_nextval.sql | 2
schema/spacewalk/postgres/procs/set_ks_session_history_message.sql | 4
schema/spacewalk/postgres/quartz/data/qrtz.sql | 2
schema/spacewalk/postgres/quartz/tables/qrtz.sql | 2
schema/spacewalk/postgres/tables/time_series.sql | 4
schema/spacewalk/postgres/triggers/rhnAction.sql | 2
schema/spacewalk/postgres/triggers/rhnActionConfigChannel.sql | 2
schema/spacewalk/postgres/triggers/rhnActionConfigDate.sql | 2
schema/spacewalk/postgres/triggers/rhnActionConfigDateFile.sql | 2
schema/spacewalk/postgres/triggers/rhnActionConfigFileName.sql | 2
schema/spacewalk/postgres/triggers/rhnActionConfigRevision.sql | 2
schema/spacewalk/postgres/triggers/rhnActionConfigRevisionResult.sql | 2
schema/spacewalk/postgres/triggers/rhnActionDaemonConfig.sql | 2
schema/spacewalk/postgres/triggers/rhnActionKickstart.sql | 2
schema/spacewalk/postgres/triggers/rhnActionKickstartFileList.sql | 2
schema/spacewalk/postgres/triggers/rhnActionKickstartGuest.sql | 2
schema/spacewalk/postgres/triggers/rhnActionPackageAnswerfile.sql | 2
schema/spacewalk/postgres/triggers/rhnActionScript.sql | 2
schema/spacewalk/postgres/triggers/rhnActionStatus.sql | 4
schema/spacewalk/postgres/triggers/rhnActionVirtDestroy.sql | 2
schema/spacewalk/postgres/triggers/rhnActionVirtReboot.sql | 2
schema/spacewalk/postgres/triggers/rhnActionVirtRefresh.sql | 2
schema/spacewalk/postgres/triggers/rhnActionVirtResume.sql | 2
schema/spacewalk/postgres/triggers/rhnActionVirtSchedulePoller.sql | 2
schema/spacewalk/postgres/triggers/rhnActionVirtSetMemory.sql | 2
schema/spacewalk/postgres/triggers/rhnActionVirtShutdown.sql | 2
schema/spacewalk/postgres/triggers/rhnActionVirtStart.sql | 2
schema/spacewalk/postgres/triggers/rhnActionVirtSuspend.sql | 2
schema/spacewalk/postgres/triggers/rhnActionVirtVcpu.sql | 2
schema/spacewalk/postgres/triggers/rhnActivationKey.sql | 2
schema/spacewalk/postgres/triggers/rhnAppInstallInstance.sql | 2
schema/spacewalk/postgres/triggers/rhnAppInstallSession.sql | 2
schema/spacewalk/postgres/triggers/rhnAppInstallSessionData.sql | 2
schema/spacewalk/postgres/triggers/rhnArchType.sql | 2
schema/spacewalk/postgres/triggers/rhnArchTypeActions.sql | 2
schema/spacewalk/postgres/triggers/rhnBeehivePathMap.sql | 2
schema/spacewalk/postgres/triggers/rhnBlacklistObsoletes.sql | 2
schema/spacewalk/postgres/triggers/rhnChannel.sql | 4
schema/spacewalk/postgres/triggers/rhnChannelArch.sql | 2
schema/spacewalk/postgres/triggers/rhnChannelCloned.sql | 4
schema/spacewalk/postgres/triggers/rhnChannelComps.sql | 2
schema/spacewalk/postgres/triggers/rhnChannelErrata.sql | 2
schema/spacewalk/postgres/triggers/rhnChannelFamily.sql | 2
schema/spacewalk/postgres/triggers/rhnChannelFamilyMembers.sql | 2
schema/spacewalk/postgres/triggers/rhnChannelPackage.sql | 4
schema/spacewalk/postgres/triggers/rhnChannelPackageArchCompat.sql | 2
schema/spacewalk/postgres/triggers/rhnChannelPermission.sql | 2
schema/spacewalk/postgres/triggers/rhnChannelPermissionRole.sql | 2
schema/spacewalk/postgres/triggers/rhnClientCapability.sql | 2
schema/spacewalk/postgres/triggers/rhnConfigChannel.sql | 4
schema/spacewalk/postgres/triggers/rhnConfigChannelType.sql | 2
schema/spacewalk/postgres/triggers/rhnConfigContent.sql | 2
schema/spacewalk/postgres/triggers/rhnConfigFile.sql | 2
schema/spacewalk/postgres/triggers/rhnConfigFileFailure.sql | 2
schema/spacewalk/postgres/triggers/rhnConfigFileName.sql | 2
schema/spacewalk/postgres/triggers/rhnConfigFileState.sql | 2
schema/spacewalk/postgres/triggers/rhnConfigFileType.sql | 2
schema/spacewalk/postgres/triggers/rhnConfigInfo.sql | 2
schema/spacewalk/postgres/triggers/rhnConfigRevision.sql | 4
schema/spacewalk/postgres/triggers/rhnCpu.sql | 2
schema/spacewalk/postgres/triggers/rhnCpuArch.sql | 2
schema/spacewalk/postgres/triggers/rhnCryptoKeyType.sql | 2
schema/spacewalk/postgres/triggers/rhnCustomDataKey.sql | 2
schema/spacewalk/postgres/triggers/rhnDevice.sql | 2
schema/spacewalk/postgres/triggers/rhnDownloads.sql | 2
schema/spacewalk/postgres/triggers/rhnEmailAddress.sql | 2
schema/spacewalk/postgres/triggers/rhnEmailAddressState.sql | 2
schema/spacewalk/postgres/triggers/rhnErrata.sql | 4
schema/spacewalk/postgres/triggers/rhnErrataBuglist.sql | 2
schema/spacewalk/postgres/triggers/rhnErrataBuglistTmp.sql | 2
schema/spacewalk/postgres/triggers/rhnErrataCVE.sql | 2
schema/spacewalk/postgres/triggers/rhnErrataCloned.sql | 2
schema/spacewalk/postgres/triggers/rhnErrataClonedTmp.sql | 2
schema/spacewalk/postgres/triggers/rhnErrataFile.sql | 2
schema/spacewalk/postgres/triggers/rhnErrataFileChannel.sql | 2
schema/spacewalk/postgres/triggers/rhnErrataFileChannelTmp.sql | 2
schema/spacewalk/postgres/triggers/rhnErrataFilePackage.sql | 2
schema/spacewalk/postgres/triggers/rhnErrataFilePackageSource.sql | 2
schema/spacewalk/postgres/triggers/rhnErrataFilePackageTmp.sql | 2
schema/spacewalk/postgres/triggers/rhnErrataFileTmp.sql | 2
schema/spacewalk/postgres/triggers/rhnErrataKeyword.sql | 2
schema/spacewalk/postgres/triggers/rhnErrataKeywordTmp.sql | 2
schema/spacewalk/postgres/triggers/rhnErrataNotificationQueue.sql | 2
schema/spacewalk/postgres/triggers/rhnErrataPackage.sql | 4
schema/spacewalk/postgres/triggers/rhnErrataPackageTmp.sql | 2
schema/spacewalk/postgres/triggers/rhnErrataTmp.sql | 2
schema/spacewalk/postgres/triggers/rhnFileList.sql | 2
schema/spacewalk/postgres/triggers/rhnFileListMembers.sql | 2
schema/spacewalk/postgres/triggers/rhnKSData.sql | 2
schema/spacewalk/postgres/triggers/rhnKSInstallType.sql | 2
schema/spacewalk/postgres/triggers/rhnKSTreeFile.sql | 2
schema/spacewalk/postgres/triggers/rhnKickstartChildChannel.sql | 2
schema/spacewalk/postgres/triggers/rhnKickstartCommand.sql | 2
schema/spacewalk/postgres/triggers/rhnKickstartDefaultRegToken.sql | 2
schema/spacewalk/postgres/triggers/rhnKickstartDefaults.sql | 2
schema/spacewalk/postgres/triggers/rhnKickstartIPRange.sql | 2
schema/spacewalk/postgres/triggers/rhnKickstartPackage.sql | 2
schema/spacewalk/postgres/triggers/rhnKickstartPreserveFileList.sql | 2
schema/spacewalk/postgres/triggers/rhnKickstartScript.sql | 2
schema/spacewalk/postgres/triggers/rhnKickstartSession.sql | 4
schema/spacewalk/postgres/triggers/rhnKickstartSessionHistory.sql | 2
schema/spacewalk/postgres/triggers/rhnKickstartSessionState.sql | 2
schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql | 2
schema/spacewalk/postgres/triggers/rhnMessage.sql | 2
schema/spacewalk/postgres/triggers/rhnOrgChannelSettings.sql | 2
schema/spacewalk/postgres/triggers/rhnOrgChannelSettingsType.sql | 2
schema/spacewalk/postgres/triggers/rhnOrgEntitlementType.sql | 2
schema/spacewalk/postgres/triggers/rhnOrgEntitlements.sql | 2
schema/spacewalk/postgres/triggers/rhnOrgQuota.sql | 4
schema/spacewalk/postgres/triggers/rhnPackage.sql | 2
schema/spacewalk/postgres/triggers/rhnPackageArch.sql | 2
schema/spacewalk/postgres/triggers/rhnPackageCapability.sql | 2
schema/spacewalk/postgres/triggers/rhnPackageChangeLog.sql | 2
schema/spacewalk/postgres/triggers/rhnPackageChangeLog_triggers.sql | 2
schema/spacewalk/postgres/triggers/rhnPackageConflicts.sql | 2
schema/spacewalk/postgres/triggers/rhnPackageDelta.sql | 2
schema/spacewalk/postgres/triggers/rhnPackageFile.sql | 2
schema/spacewalk/postgres/triggers/rhnPackageGroup.sql | 2
schema/spacewalk/postgres/triggers/rhnPackageKey.sql | 2
schema/spacewalk/postgres/triggers/rhnPackageKeyType.sql | 2
schema/spacewalk/postgres/triggers/rhnPackageObsoletes.sql | 2
schema/spacewalk/postgres/triggers/rhnPackageProvider.sql | 2
schema/spacewalk/postgres/triggers/rhnPackageProvides.sql | 2
schema/spacewalk/postgres/triggers/rhnPackageRequires.sql | 2
schema/spacewalk/postgres/triggers/rhnPackageSource.sql | 2
schema/spacewalk/postgres/triggers/rhnPackageSyncBlacklist.sql | 2
schema/spacewalk/postgres/triggers/rhnPathChannelMap.sql | 2
schema/spacewalk/postgres/triggers/rhnPrivateChannelFamily.sql | 4
schema/spacewalk/postgres/triggers/rhnProduct.sql | 2
schema/spacewalk/postgres/triggers/rhnProductLine.sql | 2
schema/spacewalk/postgres/triggers/rhnProductName.sql | 2
schema/spacewalk/postgres/triggers/rhnProvisionState.sql | 2
schema/spacewalk/postgres/triggers/rhnPushClient.sql | 2
schema/spacewalk/postgres/triggers/rhnPushClientState.sql | 2
schema/spacewalk/postgres/triggers/rhnPushDispatcher.sql | 2
schema/spacewalk/postgres/triggers/rhnRam.sql | 2
schema/spacewalk/postgres/triggers/rhnRelationshipType.sql | 2
schema/spacewalk/postgres/triggers/rhnRepoRegenQueue.sql | 2
schema/spacewalk/postgres/triggers/rhnSatelliteCert.sql | 4
schema/spacewalk/postgres/triggers/rhnSatelliteChannelFamily.sql | 2
schema/spacewalk/postgres/triggers/rhnSatelliteInfo.sql | 2
schema/spacewalk/postgres/triggers/rhnSatelliteServerGroup.sql | 2
schema/spacewalk/postgres/triggers/rhnServer.sql | 2
schema/spacewalk/postgres/triggers/rhnServerAction.sql | 2
schema/spacewalk/postgres/triggers/rhnServerActionPackageResult.sql | 2
schema/spacewalk/postgres/triggers/rhnServerActionScriptResult.sql | 2
schema/spacewalk/postgres/triggers/rhnServerActionVerifyMissing.sql | 2
schema/spacewalk/postgres/triggers/rhnServerActionVerifyResult.sql | 2
schema/spacewalk/postgres/triggers/rhnServerArch.sql | 2
schema/spacewalk/postgres/triggers/rhnServerChannel.sql | 4
schema/spacewalk/postgres/triggers/rhnServerChannelArchCompat.sql | 2
schema/spacewalk/postgres/triggers/rhnServerConfigChannel.sql | 2
schema/spacewalk/postgres/triggers/rhnServerCustomDataValue.sql | 2
schema/spacewalk/postgres/triggers/rhnServerDMI.sql | 2
schema/spacewalk/postgres/triggers/rhnServerEvent.sql | 4
schema/spacewalk/postgres/triggers/rhnServerGroup.sql | 4
schema/spacewalk/postgres/triggers/rhnServerGroupMembers.sql | 4
schema/spacewalk/postgres/triggers/rhnServerGroupNotes.sql | 2
schema/spacewalk/postgres/triggers/rhnServerHistory.sql | 2
schema/spacewalk/postgres/triggers/rhnServerInfo.sql | 4
schema/spacewalk/postgres/triggers/rhnServerInstallInfo.sql | 2
schema/spacewalk/postgres/triggers/rhnServerLocation.sql | 2
schema/spacewalk/postgres/triggers/rhnServerMessage.sql | 2
schema/spacewalk/postgres/triggers/rhnServerNetInterface.sql | 2
schema/spacewalk/postgres/triggers/rhnServerNetwork.sql | 2
schema/spacewalk/postgres/triggers/rhnServerNotes.sql | 2
schema/spacewalk/postgres/triggers/rhnServerPackageArchCompat.sql | 2
schema/spacewalk/postgres/triggers/rhnServerPath.sql | 2
schema/spacewalk/postgres/triggers/rhnServerPreserveFileList.sql | 2
schema/spacewalk/postgres/triggers/rhnServerProfileType.sql | 2
schema/spacewalk/postgres/triggers/rhnServerServerGroupArchCompat.sql | 2
schema/spacewalk/postgres/triggers/rhnSnapshotChannel.sql | 2
schema/spacewalk/postgres/triggers/rhnSnapshotConfigChannel.sql | 2
schema/spacewalk/postgres/triggers/rhnSnapshotConfigRevision.sql | 2
schema/spacewalk/postgres/triggers/rhnSnapshotInvalidReason.sql | 2
schema/spacewalk/postgres/triggers/rhnSnapshotPackage.sql | 2
schema/spacewalk/postgres/triggers/rhnSnapshotServerGroup.sql | 2
schema/spacewalk/postgres/triggers/rhnSnapshotTag.sql | 2
schema/spacewalk/postgres/triggers/rhnSolarisPatch.sql | 2
schema/spacewalk/postgres/triggers/rhnSolarisPatchSet.sql | 2
schema/spacewalk/postgres/triggers/rhnSolarisPatchSetMembers.sql | 2
schema/spacewalk/postgres/triggers/rhnSsmOperation.sql | 2
schema/spacewalk/postgres/triggers/rhnTag.sql | 2
schema/spacewalk/postgres/triggers/rhnTagName.sql | 2
schema/spacewalk/postgres/triggers/rhnTemplateCategory.sql | 2
schema/spacewalk/postgres/triggers/rhnTemplateString.sql | 2
schema/spacewalk/postgres/triggers/rhnTextMessage.sql | 2
schema/spacewalk/postgres/triggers/rhnTransaction.sql | 4
schema/spacewalk/postgres/triggers/rhnTransactionOperation.sql | 4
schema/spacewalk/postgres/triggers/rhnUserGroup.sql | 4
schema/spacewalk/postgres/triggers/rhnUserGroupMembers.sql | 4
schema/spacewalk/postgres/triggers/rhnUserInfo.sql | 4
schema/spacewalk/postgres/triggers/rhnUserReserved.sql | 2
schema/spacewalk/postgres/triggers/rhnUserServerPrefs.sql | 2
schema/spacewalk/postgres/triggers/rhnVersionInfo.sql | 2
schema/spacewalk/postgres/triggers/rhnVirtualInstance.sql | 4
schema/spacewalk/postgres/triggers/rhn_contact_methods.sql | 2
schema/spacewalk/postgres/triggers/web_contact.sql | 4
schema/spacewalk/postgres/triggers/web_customer.sql | 4
schema/spacewalk/postgres/triggers/web_user_contact_permission.sql | 2
schema/spacewalk/postgres/triggers/web_user_personal_info.sql | 4
schema/spacewalk/postgres/triggers/web_user_site_info.sql | 2
schema/spacewalk/postgres/views/rhnHistoryView.sql | 4
schema/spacewalk/postgres/views/rhnServerGroupOverview.sql | 4
schema/spacewalk/postgres/views/rhnServerNeededPackageView.sql | 4
schema/spacewalk/postgres/views/rhnServerOverview.sql | 4
schema/spacewalk/postgres/views/rhnUserChannelFamilyPerms.sql | 4
schema/spacewalk/postgres/views/rhnUserTypeCommaView.sql | 4
schema/spacewalk/postgres/views/rhnVisServerGroupOverview.sql | 4
schema/spacewalk/postgres/views/rhnVisServerGroupOverviewLite.sql | 4
schema/spacewalk/postgres/views/rhnWebContactEnabled.sql | 4
schema/spacewalk/postgres/views/rhn_customer_monitoring.sql | 4
schema/spacewalk/spacewalk-schema.spec | 13 ++
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/020-rhnTaskoBunch_data.sql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/022-rhnTaskoTemplate_data.sql | 7 -
275 files changed, 676 insertions(+), 128 deletions(-)
---
12 years, 8 months
rel-eng/packages schema/spacewalk
by Tomas Lestach
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 13 ++++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 6676f94f097288812db79fbd7163fe1052fabb7a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Sep 30 17:59:51 2010 +0200
Automatic commit of package [spacewalk-schema] release [1.2.24-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 0ea08d8..3f39e04 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.2.23-1 schema/spacewalk/
+1.2.24-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index ddf89db..f1ecd35 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.2.23
+Version: 1.2.24
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -59,6 +59,17 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Thu Sep 30 2010 Tomas Lestach <tlestach(a)redhat.com> 1.2.24-1
+- 638893 - removing duplicate cert-check-bunch (tlestach(a)redhat.com)
+- Make schema-source-sanity-check.pl happy again. (jpazdziora(a)redhat.com)
+- Update copyright years. (jpazdziora(a)redhat.com)
+- Mark the Oracle source equivalents in our PostgreSQL source files.
+ (jpazdziora(a)redhat.com)
+- 634263 - adding upgrade for previous commit (jsherril(a)redhat.com)
+- 634263 - fixing issue where converting host from virt entitled to not, would
+ cause guests registered in other orgs to consume a regular entitelment even
+ when a flex was available (jsherril(a)redhat.com)
+
* Mon Sep 27 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.2.23-1
- Marked PostgreSQL schema sources that are PostgreSQL-specific.
(jpazdziora(a)redhat.com)
12 years, 8 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/manager/action/ActionManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f96aca1c692526141dd35cc6fe6c711effbdfcdf
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Sep 30 17:58:06 2010 +0200
checkstyle issue
diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
index 8e8bdb3..455ef63 100644
--- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
+++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
@@ -1590,7 +1590,7 @@ public class ActionManager extends BaseManager {
* Schedule a scheduleHardwareRefreshAction against a system or systems
* @param scheduler User scheduling the action.
* @param earliestAction Date run the Action
- * @param srvr Server(s) for which the action affects.
+ * @param serverIds server ids meant for the action
* @return Currently scheduled KickstartAction
*/
public static Action scheduleHardwareRefreshAction(User scheduler, Date earliestAction,
12 years, 8 months
2 commits - java/code schema/spacewalk
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml | 46 ++++++----
java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java | 22 +++-
schema/spacewalk/common/data/rhnTaskoBunch.sql | 3
schema/spacewalk/oracle/data/rhnTaskoTemplate.sql | 7 -
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/020-rhnTaskoBunch_data.sql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/022-rhnTaskoTemplate_data.sql | 7 -
6 files changed, 48 insertions(+), 40 deletions(-)
New commits:
commit 32f2dfd5ce49c4ba49cc3bddf45d9507bfaafc4a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Sep 30 17:45:07 2010 +0200
638893 - removing duplicate cert-check-bunch
diff --git a/schema/spacewalk/common/data/rhnTaskoBunch.sql b/schema/spacewalk/common/data/rhnTaskoBunch.sql
index 025fe91..4338063 100644
--- a/schema/spacewalk/common/data/rhnTaskoBunch.sql
+++ b/schema/spacewalk/common/data/rhnTaskoBunch.sql
@@ -46,9 +46,6 @@ INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
VALUES (rhn_tasko_bunch_id_seq.nextval, 'session-cleanup-bunch', 'Deletes expired rows from the PXTSessions table to keep it from growing too large', '');
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
- VALUES (rhn_tasko_bunch_id_seq.nextval, 'cert-check-bunch', 'Satellite certificate check', '');
-
-INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
VALUES (rhn_tasko_bunch_id_seq.nextval, 'sandbox-cleanup-bunch', 'Clean up sandbox', '');
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
diff --git a/schema/spacewalk/oracle/data/rhnTaskoTemplate.sql b/schema/spacewalk/oracle/data/rhnTaskoTemplate.sql
index 4253a1a..310d746 100644
--- a/schema/spacewalk/oracle/data/rhnTaskoTemplate.sql
+++ b/schema/spacewalk/oracle/data/rhnTaskoTemplate.sql
@@ -79,13 +79,6 @@ INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
- (SELECT id FROM rhnTaskoBunch WHERE name='cert-check-bunch'),
- (SELECT id FROM rhnTaskoTask WHERE name='sat-cert-check'),
- 0,
- '');
-
-INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
- VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='sandbox-cleanup-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='sandbox-cleanup'),
0,
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/020-rhnTaskoBunch_data.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/020-rhnTaskoBunch_data.sql
index cfb244f..b4dbc1d 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/020-rhnTaskoBunch_data.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/020-rhnTaskoBunch_data.sql
@@ -46,9 +46,6 @@ INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
VALUES (rhn_tasko_bunch_id_seq.nextval, 'session-cleanup-bunch', 'Deletes expired rows from the PXTSessions table to keep it from growing too large', '');
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
- VALUES (rhn_tasko_bunch_id_seq.nextval, 'cert-check-bunch', 'Satellite certificate check', '');
-
-INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
VALUES (rhn_tasko_bunch_id_seq.nextval, 'sandbox-cleanup-bunch', 'Clean up sandbox', '');
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/022-rhnTaskoTemplate_data.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/022-rhnTaskoTemplate_data.sql
index 0082d64..7f6f93b 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/022-rhnTaskoTemplate_data.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/022-rhnTaskoTemplate_data.sql
@@ -79,13 +79,6 @@ INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
- (SELECT id FROM rhnTaskoBunch WHERE name='cert-check-bunch'),
- (SELECT id FROM rhnTaskoTask WHERE name='sat-cert-check'),
- 0,
- '');
-
-INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
- VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='sandbox-cleanup-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='sandbox-cleanup'),
0,
commit 9bb02727bdf76339ad45fbaf00932b0bd50867e4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Sep 30 17:13:33 2010 +0200
distinguish spacewalk and satellite email body, when certificate expires
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
index 6e7d2dc..8d01d6c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
@@ -547,7 +547,7 @@ Thank you for using @@PRODUCT_NAME@@.
</trans-unit>
<trans-unit id="email.satellitecert.graceperiod.subject">
-<source>Red Hat @@PRODUCT_NAME@@ Server Certificate expiration warning</source>
+<source>@@PRODUCT_NAME@@ Certificate expiration warning</source>
<context-group name="ctx">
<context context-type="sourcefile">Taskomatic: @@PRODUCT_NAME@@CertificateCheck</context>
</context-group>
@@ -558,14 +558,8 @@ Thank you for using @@PRODUCT_NAME@@.
Dear @@PRODUCT_NAME@@ User,
This email is being sent to you to inform you that your @@PRODUCT_NAME@@ Certificate
-has expired on your local satellite {0}. After {1} day(s) the systems
-management services provided by your @@PRODUCT_NAME@@ Server will become inaccessible.
-Please contact your regional Red Hat Customer Service Representative for information
-on how to renew your @@PRODUCT_NAME@@ Certificate.
-
-Thank you for using @@PRODUCT_NAME@@.
---the @@PRODUCT_NAME@@ Team
-</source>
+has expired on your {0} server. After {1} day(s) the systems
+management services provided by your @@PRODUCT_NAME@@ Server will become inaccessible.</source>
<context-group name="ctx">
<context context-type="sourcefile">Taskomatic: @@PRODUCT_NAME@@CertificateCheck</context>
<context context-type="paramnotes">
@@ -576,20 +570,28 @@ Thank you for using @@PRODUCT_NAME@@.
</trans-unit>
<trans-unit id="email.satellitecert.expired.subject">
-<source>Red Hat satellite certificate expiration notice</source>
+<source>@@PRODUCT_NAME@@ Certificate expiration notice</source>
<context-group name="ctx">
<context context-type="sourcefile">Taskomatic: @@PRODUCT_NAME@@CertificateCheck</context>
</context-group>
</trans-unit>
- <trans-unit id="email.satellitecert.expired.body">
+ <trans-unit id="email.satellitecert.spwbodyend">
<source>
-Dear @@PRODUCT_NAME@@ User,
-This email is being sent to you to inform you that your @@PRODUCT_NAME@@ Certificate
-has expired on your local satellite {0}. The system management services will be inaccessible
-until your certificate is renewed. Please contact your regional Red Hat
-Customer Service Representative for information on how to renew your @@PRODUCT_NAME@@ Certificate.
+
+Thank you for using @@PRODUCT_NAME@@.
+--the @@PRODUCT_NAME@@ Team
+</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">Taskomatic: @@PRODUCT_NAME@@CertificateCheck</context>
+ </context-group>
+ </trans-unit>
+
+ <trans-unit id="email.satellitecert.satbodyend">
+<source>
+Please contact your regional Red Hat Customer Service Representative for information
+on how to renew your @@PRODUCT_NAME@@ Certificate.
Thank you for using @@PRODUCT_NAME@@.
@@ -597,6 +599,18 @@ Thank you for using @@PRODUCT_NAME@@.
</source>
<context-group name="ctx">
<context context-type="sourcefile">Taskomatic: @@PRODUCT_NAME@@CertificateCheck</context>
+ </context-group>
+ </trans-unit>
+
+ <trans-unit id="email.satellitecert.expired.body">
+<source>
+Dear @@PRODUCT_NAME@@ User,
+
+This email is being sent to you to inform you that your @@PRODUCT_NAME@@ Certificate
+has expired on your {0} server. The system management services will be inaccessible
+until your certificate is renewed.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">Taskomatic: @@PRODUCT_NAME@@CertificateCheck</context>
<context context-type="paramnotes">{0} - Hostname of the @@PRODUCT_NAME@@ Whose Cert has Expired: highwind.devel.redhat.com </context>
</context-group>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java b/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java
index 7dae87e..41db20a 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java
@@ -43,9 +43,16 @@ public class SatelliteCertificateCheck extends RhnJavaJob {
CertificateManager man = CertificateManager.getInstance();
if (man.isSatelliteCertExpired()) {
- sendMessage(ls.getMessage("email.satellitecert.expired.subject"),
- ls.getMessage("email.satellitecert.expired.body",
- ConfigDefaults.get().getHostname()));
+ String body = ls.getMessage("email.satellitecert.expired.body",
+ ConfigDefaults.get().getHostname());
+ if (ConfigDefaults.get().isSpacewalk()) {
+ body += ls.getMessage("email.satellitecert.spwbodyend");
+ }
+ else {
+ body += ls.getMessage("email.satellitecert.satbodyend");
+ }
+ sendMessage(ls.getMessage("email.satellitecert.expired.subject"),
+ body);
}
else if (man.isSatelliteCertInGracePeriod()) {
long daysUntilExpiration = (man.getGracePeriodEndDate().getTime() -
@@ -55,8 +62,15 @@ public class SatelliteCertificateCheck extends RhnJavaJob {
Object[] args = new String[2];
args[0] = ConfigDefaults.get().getHostname();
args[1] = new Long(daysUntilExpiration).toString();
+ String body = ls.getMessage("email.satellitecert.graceperiod.body", args);
+ if (ConfigDefaults.get().isSpacewalk()) {
+ body += ls.getMessage("email.satellitecert.spwbodyend");
+ }
+ else {
+ body += ls.getMessage("email.satellitecert.satbodyend");
+ }
sendMessage(ls.getMessage("email.satellitecert.graceperiod.subject"),
- ls.getMessage("email.satellitecert.graceperiod.body", args));
+ body);
}
}
12 years, 8 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/postgres/procs/delete_server.sql | 2 +-
schema/spacewalk/postgres/procs/lookup_config_info.sql | 2 +-
schema/spacewalk/postgres/triggers/rhnConfigRevision.sql | 2 +-
schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql | 2 +-
schema/spacewalk/postgres/triggers/rhnPackage.sql | 2 +-
schema/spacewalk/postgres/triggers/web_user_personal_info.sql | 2 +-
schema/spacewalk/postgres/views/rhnServerOverview.sql | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit e981aadc25011058a8375eada419365ae0c33300
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Sep 30 17:07:56 2010 +0200
Make schema-source-sanity-check.pl happy again.
We need to go through these PostgreSQL sources and bring
them up-to-date with the Oracle ones.
diff --git a/schema/spacewalk/postgres/procs/delete_server.sql b/schema/spacewalk/postgres/procs/delete_server.sql
index 3ede67f..c4eeda0 100644
--- a/schema/spacewalk/postgres/procs/delete_server.sql
+++ b/schema/spacewalk/postgres/procs/delete_server.sql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 e16a211073e298ca515b54eb9c5eb51896463108
+-- -- oracle equivalent source sha1 e16a211073e298ca515b54eb9c5eb51896463108
-- retrieved from ./1241139299/9d12c670ec75dda96634543d6082c6162eee0e97/schema/spacewalk/oracle/procs/delete_server.sql
--
-- Copyright (c) 2008--2010 Red Hat, Inc.
diff --git a/schema/spacewalk/postgres/procs/lookup_config_info.sql b/schema/spacewalk/postgres/procs/lookup_config_info.sql
index 6c6f2fe..1cb276e 100644
--- a/schema/spacewalk/postgres/procs/lookup_config_info.sql
+++ b/schema/spacewalk/postgres/procs/lookup_config_info.sql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 0c237c905234e929d8cca49d6d44b62cd2bede5c
+-- -- oracle equivalent source sha1 0c237c905234e929d8cca49d6d44b62cd2bede5c
-- retrieved from ./1249507968/a04b2169abc1974cee1a27cc15be4c4f9ba60dc1/schema/spacewalk/oracle/procs/lookup_config_info.sql
--
-- Copyright (c) 2008--2010 Red Hat, Inc.
diff --git a/schema/spacewalk/postgres/triggers/rhnConfigRevision.sql b/schema/spacewalk/postgres/triggers/rhnConfigRevision.sql
index ec1524c..101b91f 100644
--- a/schema/spacewalk/postgres/triggers/rhnConfigRevision.sql
+++ b/schema/spacewalk/postgres/triggers/rhnConfigRevision.sql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 d5186095aa52f20774e7d1d34a674600d0eef083
+-- -- oracle equivalent source sha1 d5186095aa52f20774e7d1d34a674600d0eef083
-- retrieved from ./1241132947/9984c41fb98d15becf3c29432c19cd7a266dece4/schema/spacewalk/oracle/triggers/rhnConfigRevision.sql
--
-- Copyright (c) 2008--2010 Red Hat, Inc.
diff --git a/schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql b/schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql
index 8420fec..fa08d4b 100644
--- a/schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql
+++ b/schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 dad3fd270a0d44713bb4d0f05b748171f225ba64
+-- -- oracle equivalent source sha1 dad3fd270a0d44713bb4d0f05b748171f225ba64
-- retrieved from ./1241132947/9984c41fb98d15becf3c29432c19cd7a266dece4/schema/spacewalk/oracle/triggers/rhnKickstartableTree.sql
create or replace function rhn_kstree_mod_trig_fun() returns trigger as
$$
diff --git a/schema/spacewalk/postgres/triggers/rhnPackage.sql b/schema/spacewalk/postgres/triggers/rhnPackage.sql
index 7915520..40706c0 100644
--- a/schema/spacewalk/postgres/triggers/rhnPackage.sql
+++ b/schema/spacewalk/postgres/triggers/rhnPackage.sql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 12b86774d397b362eff24f4d99490b8b6d77e9ad
+-- -- oracle equivalent source sha1 12b86774d397b362eff24f4d99490b8b6d77e9ad
-- retrieved from ./1241132947/9984c41fb98d15becf3c29432c19cd7a266dece4/schema/spacewalk/oracle/triggers/rhnPackage.sql
create or replace function rhn_package_mod_trig_fun() returns trigger as
$$
diff --git a/schema/spacewalk/postgres/triggers/web_user_personal_info.sql b/schema/spacewalk/postgres/triggers/web_user_personal_info.sql
index f665578..36f0331 100644
--- a/schema/spacewalk/postgres/triggers/web_user_personal_info.sql
+++ b/schema/spacewalk/postgres/triggers/web_user_personal_info.sql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 50d71d29fcb58e20fdeb000046ab5d5a60ac5082
+-- -- oracle equivalent source sha1 50d71d29fcb58e20fdeb000046ab5d5a60ac5082
-- retrieved from ./1239053651/49a123cbe214299834e6ce97b10046d8d9c7642a/schema/spacewalk/oracle/triggers/web_user_personal_info.sql
--
-- Copyright (c) 2008--2010 Red Hat, Inc.
diff --git a/schema/spacewalk/postgres/views/rhnServerOverview.sql b/schema/spacewalk/postgres/views/rhnServerOverview.sql
index fdb542c..3eb2d0f 100644
--- a/schema/spacewalk/postgres/views/rhnServerOverview.sql
+++ b/schema/spacewalk/postgres/views/rhnServerOverview.sql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 6582bbf3a236c11485b0d54b642b2793f49c1457
+-- -- oracle equivalent source sha1 6582bbf3a236c11485b0d54b642b2793f49c1457
-- retrieved from ./1235117057/2510d6bed246794de798c9c9b00e8cd21d99a4dc/schema/spacewalk/rhnsat/views/rhnServerOverview.sql
--
-- Copyright (c) 2008--2010 Red Hat, Inc.
12 years, 8 months