backend/satellite_tools
by Jan Pazdziora
backend/satellite_tools/rhn-schema-version | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a3c17db2abf01a17d312eacb54335f18db032d5d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jan 24 14:17:25 2011 +0100
Make rhn-schema-version work on PostgreSQL.
Addressing
psycopg2.NotSupportedError: cross-database references are not implemented: pe.evr.as_vre_simple
diff --git a/backend/satellite_tools/rhn-schema-version b/backend/satellite_tools/rhn-schema-version
index 7da1d69..41d31da 100755
--- a/backend/satellite_tools/rhn-schema-version
+++ b/backend/satellite_tools/rhn-schema-version
@@ -90,7 +90,7 @@ if __name__ == '__main__':
try:
h = rhnSQL.prepare("""
- SELECT PE.evr.as_vre_simple()
+ SELECT evr_t_as_vre_simple(PE.evr) as evrsimple
FROM rhnPackageEVR PE, rhnVersionInfo RVI, rhnPackageName PN
WHERE RVI.label = 'schema'
AND RVI.name_id = PN.id
@@ -99,7 +99,7 @@ if __name__ == '__main__':
h.execute()
row = h.fetchone_dict()
if row:
- print row['pe.evr.as_vre_simple()']
+ print row['evrsimple']
except KeyboardInterrupt:
sys.stderr.write("\nUser interrupted process.\n")
sys.exit(0)
13 years, 3 months
Changes to 'refs/tags/spacewalk-backend-1.3.47-1'
by Miroslav Suchý
Tag 'spacewalk-backend-1.3.47-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-01-21 19:42 +0000
Tagging package [spacewalk-backend] version [1.3.47-1] in directory [backend/].
Changes since spacewalk-java-1.3.48-1:
Miroslav Suchý (2):
657091 - honor http proxy setting for spacewalk-repo-sync
Automatic commit of package [spacewalk-backend] release [1.3.47-1].
---
backend/satellite_tools/repo_plugins/yum_src.py | 16 ++++++++++++++++
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 21 insertions(+), 2 deletions(-)
---
13 years, 3 months
2 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Miroslav Suchý
backend/satellite_tools/repo_plugins/yum_src.py | 16 ++++++++++++++++
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 21 insertions(+), 2 deletions(-)
New commits:
commit 0265e6e9fc60ee6e93ca6384670d9978b85e938c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jan 21 20:42:13 2011 +0100
Automatic commit of package [spacewalk-backend] release [1.3.47-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 4ddcbce..500f8c5 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 and Python
-Version: 1.3.46
+Version: 1.3.47
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -684,6 +684,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Jan 21 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.3.47-1
+- 657091 - honor http proxy setting for spacewalk-repo-sync
+
* Fri Jan 21 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.3.46-1
- 671466 - use ansi syntax in left join
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 04cba72..05dab99 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.3.46-1 backend/
+1.3.47-1 backend/
commit 6690c51c5cbdc83de9eb5989ebc63fd1cedfa1fa
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jan 21 20:31:35 2011 +0100
657091 - honor http proxy setting for spacewalk-repo-sync
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py
index 12f44a7..7afc6d4 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -16,6 +16,7 @@ import yum
import shutil
import sys
from spacewalk.satellite_tools.reposync import ContentPackage
+from spacewalk.common import CFG, initCFG
class YumWarnings:
def write(self, s):
@@ -36,6 +37,19 @@ class ContentSource:
self.name = name
self._clean_cache(self.cache_dir + name)
+ # read the proxy configuration in /etc/rhn/rhn.conf
+ initCFG('server.satellite')
+ self.proxy_addr = CFG.http_proxy
+ self.proxy_user = CFG.http_proxy_username
+ self.proxy_pass = CFG.http_proxy_password
+
+ if (self.proxy_user is not None and self.proxy_pass is not None and self.proxy_addr is not None):
+ self.proxy_url = "http://%s:%s@%s" %(self.proxy_user, self.proxy_pass, self.proxy_addr)
+ elif (self.proxy_addr is not None):
+ self.proxy_url = "http://%s" %(self.proxy_addr)
+ else:
+ self.proxy_url = None
+
def list_packages(self):
""" list packages"""
repo = yum.yumRepo.YumRepository(self.name)
@@ -45,6 +59,8 @@ class ContentSource:
repo.mirrorlist = self.url
repo.baseurl = [self.url]
repo.basecachedir = self.cache_dir
+ if self.proxy is not None:
+ repo.proxy = self.proxy_url
warnings = YumWarnings()
warnings.disable()
13 years, 3 months
Changes to 'refs/tags/spacewalk-java-1.3.48-1'
by Tomas Lestach
Tag 'spacewalk-java-1.3.48-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-01-21 16:47 +0000
Tagging package [spacewalk-java] version [1.3.48-1] in directory [java/].
Changes since spacewalk-backend-1.3.46-1:
Tomas Lestach (3):
unschedule eventual repo sync schedules, when deleting channel
fixing ISE when deleting software channel from the rhn/channels/manage/Repositories.do page
Automatic commit of package [spacewalk-java] release [1.3.48-1].
---
java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java | 1
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 22 ++++++++++
java/spacewalk-java.spec | 8 +++
rel-eng/packages/spacewalk-java | 2
4 files changed, 31 insertions(+), 2 deletions(-)
---
13 years, 3 months
3 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java | 1
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 22 ++++++++++
java/spacewalk-java.spec | 8 +++
rel-eng/packages/spacewalk-java | 2
4 files changed, 31 insertions(+), 2 deletions(-)
New commits:
commit 2f30e5e42f33db80a9928ff33cb4969ae6b4b77c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 21 17:47:02 2011 +0100
Automatic commit of package [spacewalk-java] release [1.3.48-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d3fc5b3..2820c9d 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.47
+Version: 1.3.48
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -535,6 +535,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jan 21 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.48-1
+- fixing ISE when deleting software channel from the
+ rhn/channels/manage/Repositories.do page (tlestach(a)redhat.com)
+- unschedule eventual repo sync schedules, when deleting channel
+ (tlestach(a)redhat.com)
+
* Wed Jan 12 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.47-1
- asm requires different handling on fedoras and rhels (tlestach(a)redhat.com)
- replace jakarta-commons-logging with apache-commons-logging on F14
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index fab3e38..63549e3 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.3.47-1 java/
+1.3.48-1 java/
commit 0c0698dad3217f3ab4969ff9d65d3765cbfca9fa
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 21 17:25:42 2011 +0100
fixing ISE when deleting software channel from the rhn/channels/manage/Repositories.do page
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java
index 53d0707..a797a79 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java
@@ -59,6 +59,7 @@ public class RepositoriesAction extends RhnAction implements Listable {
long cid = context.getRequiredParam("cid");
Channel chan = ChannelFactory.lookupByIdAndUser(cid, user);
request.setAttribute("channel_name", chan.getName());
+ request.setAttribute("cid", chan.getId());
Map params = new HashMap();
params.put(RequestContext.CID, chan.getId().toString());
commit 47043db7583f648f279929285f8a6ee8f85c470f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 21 16:41:51 2011 +0100
unschedule eventual repo sync schedules, when deleting channel
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index 6009aab..d62ce44 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -72,6 +72,7 @@ import com.redhat.rhn.manager.rhnpackage.PackageManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.system.SystemManager;
import com.redhat.rhn.manager.user.UserManager;
+import com.redhat.rhn.taskomatic.TaskomaticApi;
import com.redhat.rhn.taskomatic.task.TaskConstants;
import org.apache.commons.lang.BooleanUtils;
@@ -878,6 +879,7 @@ public class ChannelManager extends BaseManager {
"message.channel.cannot-be-deleted.has-distros");
}
+ ChannelManager.unscheduleEventualRepoSync(toRemove, user);
ChannelManager.queueChannelChange(label,
user.getLogin(), "java::deleteChannel");
ChannelFactory.remove(toRemove);
@@ -885,6 +887,26 @@ public class ChannelManager extends BaseManager {
}
/**
+ * Unschedule eventual repo sync schedule
+ * @param channel relevant channel
+ * @param user executive
+ */
+ public static void unscheduleEventualRepoSync(Channel channel, User user) {
+ TaskomaticApi tapi = new TaskomaticApi();
+ try {
+ String cronExpr = tapi.getRepoSyncSchedule(channel, user);
+ if (!StringUtils.isEmpty(cronExpr)) {
+ log.info("Unscheduling repo sync schedule with " + cronExpr +
+ " for channel " + channel.getLabel());
+ tapi.unscheduleRepoSync(channel, user);
+ }
+ }
+ catch (Exception e) {
+ log.warn("Failed to unschedule repo sync for channel " + channel.getLabel());
+ }
+ }
+
+ /**
* Verify that a user is a channel admin
* @param user the user to verify
* @param cid the channel id to verify
13 years, 3 months
Changes to 'refs/tags/spacewalk-backend-1.3.46-1'
by Miroslav Suchý
Tag 'spacewalk-backend-1.3.46-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-01-21 16:33 +0000
Tagging package [spacewalk-backend] version [1.3.46-1] in directory [backend/].
Changes since spacewalk-schema-1.3.16-1:
Miroslav Suchý (2):
671466 - use ansi syntax in left join
Automatic commit of package [spacewalk-backend] release [1.3.46-1].
---
backend/server/action/packages.py | 77 ++++++++++++++++++-------------------
backend/spacewalk-backend.spec | 5 +-
rel-eng/packages/spacewalk-backend | 2
3 files changed, 44 insertions(+), 40 deletions(-)
---
13 years, 3 months
2 commits - backend/server backend/spacewalk-backend.spec rel-eng/packages
by Miroslav Suchý
backend/server/action/packages.py | 77 ++++++++++++++++++-------------------
backend/spacewalk-backend.spec | 5 +-
rel-eng/packages/spacewalk-backend | 2
3 files changed, 44 insertions(+), 40 deletions(-)
New commits:
commit e27de35ffa38289c6e29c548beaba23db1937a34
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jan 21 17:33:21 2011 +0100
Automatic commit of package [spacewalk-backend] release [1.3.46-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 61cf69c..4ddcbce 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 and Python
-Version: 1.3.45
+Version: 1.3.46
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -684,6 +684,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Jan 21 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.3.46-1
+- 671466 - use ansi syntax in left join
+
* Thu Jan 20 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.45-1
- updating Copyright years for year 2011 (tlestach(a)redhat.com)
- update .po and .pot files for spacewalk-backend (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index fd7268f..04cba72 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.3.45-1 backend/
+1.3.46-1 backend/
commit 7721a8e21f945922daa07a11367bb5e44efa6c0e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jan 21 17:20:57 2011 +0100
671466 - use ansi syntax in left join
This is to make the query digestible for PostgreSQL
diff --git a/backend/server/action/packages.py b/backend/server/action/packages.py
index b32f4b2..bd3b28f 100644
--- a/backend/server/action/packages.py
+++ b/backend/server/action/packages.py
@@ -142,17 +142,18 @@ def runTransaction(server_id, action_id, dry_run=0):
# Fetch packages
h = rhnSQL.prepare("""
- select tro.label operation, pn.name, pe.version, pe.release, pe.epoch,
- pa.label package_arch
- from rhnPackageDeltaElement pde, rhnTransactionPackage rp,
- rhnTransactionOperation tro, rhnPackageName pn, rhnPackageEVR pe,
- rhnPackageArch pa
+ select tro.label as operation, pn.name, pe.version, pe.release, pe.epoch,
+ pa.label as package_arch
+ from rhnPackageDeltaElement pde,
+ rhnTransactionPackage rp
+ left join rhnPackageArch pa
+ on rp.package_arch_id = pa.id,
+ rhnTransactionOperation tro, rhnPackageName pn, rhnPackageEVR pe,
where pde.package_delta_id = :package_delta_id
and pde.transaction_package_id = rp.id
and rp.operation = tro.id
and rp.name_id = pn.id
and rp.evr_id = pe.id
- and rp.package_arch_id = pa.id (+)
order by tro.label, pn.name
""")
h.execute(package_delta_id=package_delta_id)
@@ -194,16 +195,17 @@ def runTransaction(server_id, action_id, dry_run=0):
# SQL statements -- used by update()
_packageStatement_update = """
select distinct
- pn.name name,
- pe.epoch epoch,
- pe.version version,
- pe.release release,
- pa.label arch
- from rhnActionPackage ap,
+ pn.name as name,
+ pe.epoch as epoch,
+ pe.version as version,
+ pe.release as release,
+ pa.label as arch
+ from rhnActionPackage ap
+left join rhnPackageArch pa
+ on ap.package_arch_id = pa.id,
rhnPackage p,
rhnPackageName pn,
rhnPackageEVR pe,
- rhnPackageArch pa,
rhnServerChannel sc,
rhnChannelPackage cp
where ap.action_id = :actionid
@@ -212,67 +214,66 @@ _packageStatement_update = """
and ap.evr_id = pe.id
and ap.name_id = p.name_id
and ap.name_id = pn.id
- and ap.package_arch_id = pa.id(+)
and p.id = cp.package_id
and cp.channel_id = sc.channel_id
and sc.server_id = :serverid
union
select distinct
- pn.name name,
- null version,
- null release,
- null epoch,
- pa.label arch
- from rhnActionPackage ap,
+ pn.name as name,
+ null as version,
+ null as release,
+ null as epoch,
+ pa.label as arch
+ from rhnActionPackage ap
+left join rhnPackageArch pa
+ on ap.package_arch_id = pa.id,
rhnPackage p,
rhnPackageName pn,
- rhnPackageArch pa,
rhnServerChannel sc,
rhnChannelPackage cp
where ap.action_id = :actionid
and ap.evr_id is null
and ap.name_id = p.name_id
and p.name_id = pn.id
- and ap.package_arch_id = pa.id(+)
and p.id = cp.package_id
and cp.channel_id = sc.channel_id
and sc.server_id = :serverid"""
_packageStatement_remove = """
select distinct
- pn.name name,
- pe.epoch epoch,
- pe.version version,
- pe.release release,
- pa.label arch
- from rhnActionPackage ap,
+ pn.name as name,
+ pe.epoch as epoch,
+ pe.version as version,
+ pe.release as release,
+ pa.label as arch
+ from rhnActionPackage ap
+left join rhnPackageArch pa
+ on ap.package_arch_id = pa.id,
rhnPackageName pn,
rhnPackageEVR pe,
- rhnPackageArch pa,
rhnServerPackage sp
where ap.action_id = :actionid
and ap.evr_id is not null
and ap.evr_id = pe.id
and ap.name_id = pn.id
- and ap.package_arch_id = pa.id(+)
and sp.server_id = :serverid
and sp.name_id = ap.name_id
and sp.evr_id = ap.evr_id
and (sp.package_arch_id = ap.package_arch_id or sp.package_arch_id is null)
union
select distinct
- pn.name name,
- null version,
- null release,
- null epoch,
- pa.label arch
- from rhnActionPackage ap,
+ pn.name as name,
+ null as version,
+ null as release,
+ null as epoch,
+ pa.label as arch
+ from rhnActionPackage ap
+left join rhnPackageArch pa
+ on ap.package_arch_id = pa.id,
rhnPackageName pn,
- rhnPackageArch pa,
rhnServerPackage sp
where ap.action_id = :actionid
and ap.evr_id is null
- and ap.package_arch_id = pa.id(+)
and sp.server_id = :serverid
and (sp.package_arch_id = ap.package_arch_id or sp.package_arch_id is null)"""
13 years, 3 months
Changes to 'refs/tags/spacewalk-schema-1.3.16-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.3.16-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-01-21 16:02 +0000
Tagging package [spacewalk-schema] version [1.3.16-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-1.3.15-1:
Jan Pazdziora (2):
The evr_t_as_vre_simple is not available on old Spacewalks.
Automatic commit of package [spacewalk-schema] release [1.3.16-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema-upgrade | 4 ++--
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
3 files changed, 7 insertions(+), 4 deletions(-)
---
13 years, 3 months
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e87f9359d214f3b47a439fcb4f4b2aa38ce88eb4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 21 17:02:23 2011 +0100
Automatic commit of package [spacewalk-schema] release [1.3.16-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 679e2cb..bf1b20b 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.3.15-1 schema/spacewalk/
+1.3.16-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 607d71d..5335c17 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.3.15
+Version: 1.3.16
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Jan 21 2011 Jan Pazdziora 1.3.16-1
+- The evr_t_as_vre_simple is not available on old Spacewalks, fixed.
+
* Fri Jan 21 2011 Jan Pazdziora 1.3.15-1
- Changed spacewalk-schema-upgrade to use spacewalk-sql, to run on PostgreSQL.
13 years, 3 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/spacewalk-schema-upgrade | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 76cc1318d15aa23b4e3a1891a2b63fe8876f1f90
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 21 16:04:44 2011 +0100
The evr_t_as_vre_simple is not available on old Spacewalks.
diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade
index 7908c0b..24466b0 100755
--- a/schema/spacewalk/spacewalk-schema-upgrade
+++ b/schema/spacewalk/spacewalk-schema-upgrade
@@ -30,7 +30,7 @@ if ($test ne '123') {
}
my $schema_version = run_query(<<EOF);
- select rhnPackageName.name || '-' || evr_t_as_vre_simple(PE.evr)
+ select rhnPackageName.name || '-' || (PE.evr).version || '-' || (PE.evr).release
from rhnVersionInfo, rhnPackageName, rhnPackageEVR PE
where rhnVersionInfo.label = 'schema'
and rhnVersionInfo.name_id = rhnPackageName.id
@@ -251,7 +251,7 @@ if ($?) {
}
my $new_schema_version = run_query(<<EOF);
- select rhnPackageName.name || '-' || evr_t_as_vre_simple(PE.evr)
+ select rhnPackageName.name || '-' || (PE.evr).version || '-' || (PE.evr).release
from rhnVersionInfo, rhnPackageName, rhnPackageEVR PE
where rhnVersionInfo.label = 'schema'
and rhnVersionInfo.name_id = rhnPackageName.id
13 years, 3 months