6 commits - spacecmd/src
by shardy
spacecmd/src/lib/activationkey.py | 17 +++++++++++++----
spacecmd/src/lib/configchannel.py | 20 +++++++++++++++++---
spacecmd/src/lib/kickstart.py | 7 ++++++-
spacecmd/src/lib/utils.py | 9 ++++++---
4 files changed, 42 insertions(+), 11 deletions(-)
New commits:
commit b72099109cc6212ada8e98bc9028f4dc40e71f5d
Author: Steven Hardy <shardy(a)redhat.com>
Date: Thu May 24 15:30:25 2012 +0100
spacecmd bugfix : kickstart_getcontents fix character encoding error
The API can return characters in the rendered kickstart which can't
be rendered by the default ascii encoder, encoding UTF8 aligns with
the API and works around the problem.
Signed-off-by: Steven Hardy <shardy(a)redhat.com>
diff --git a/spacecmd/src/lib/kickstart.py b/spacecmd/src/lib/kickstart.py
index ef622ec..4f23eb0 100644
--- a/spacecmd/src/lib/kickstart.py
+++ b/spacecmd/src/lib/kickstart.py
@@ -479,7 +479,12 @@ def do_kickstart_getcontents(self, args):
kickstart = self.kickstart_getcontents(profile)
if kickstart:
- print kickstart
+ # We try to encode the output as UTF8, which is what we expect from
+ # the API. This avoids "'ascii' codec can't encode character" errors
+ try:
+ print kickstart.encode('UTF8')
+ except:
+ print kickstart
####################
commit dc9b54b6dbc6f18b045d584f9e9289788f1a04bc
Author: Steven Hardy <shardy(a)redhat.com>
Date: Thu May 24 14:26:11 2012 +0100
spacecmd bugfix: activationkey_import don't add empty package/group lists
Don't attempt to add empty lists of packages or groups to the activationkey
Signed-off-by: Steven Hardy <shardy(a)redhat.com>
diff --git a/spacecmd/src/lib/activationkey.py b/spacecmd/src/lib/activationkey.py
index 2c28615..904c59c 100644
--- a/spacecmd/src/lib/activationkey.py
+++ b/spacecmd/src/lib/activationkey.py
@@ -1197,12 +1197,15 @@ def import_activationkey_fromdetails(self, keydetails):
grp)
gids.append(grpdetails.get('id'))
- logging.debug("Adding groups %s to key %s" % (gids, newkey))
- self.client.activationkey.addServerGroups(self.session, newkey, gids)
+ if gids:
+ logging.debug("Adding groups %s to key %s" % (gids, newkey))
+ self.client.activationkey.addServerGroups(self.session, newkey,
+ gids)
# Finally add the package list
- self.client.activationkey.addPackages(self.session, newkey, \
- keydetails['packages'])
+ if keydetails['packages']:
+ self.client.activationkey.addPackages(self.session, newkey,
+ keydetails['packages'])
return True
commit dd78914c9ca44c2056d08f41bca07ed2ae890562
Author: Steven Hardy <shardy(a)redhat.com>
Date: Thu May 24 14:17:39 2012 +0100
spacecmd bugfix : fix activationkey_import when no base-channel specified
815118 - activationkey_import fails when no base channel is set
This fix maintains the existing json format and maps json "none" to
and empty string which is what the API expects for default base-channel
Signed-off-by: Steven Hardy <shardy(a)redhat.com>
diff --git a/spacecmd/src/lib/activationkey.py b/spacecmd/src/lib/activationkey.py
index 41406ee..2c28615 100644
--- a/spacecmd/src/lib/activationkey.py
+++ b/spacecmd/src/lib/activationkey.py
@@ -1145,6 +1145,12 @@ def import_activationkey_fromdetails(self, keydetails):
logging.debug("Found key %s, importing as %s" % \
(keydetails['key'], keyname))
+ # Channel label must be an empty-string for "RHN Satellite Default"
+ # The export to json maps this to a unicode string "none"
+ # To avoid changing the json format now, just fix it up here...
+ if keydetails['base_channel_label'] == "none":
+ keydetails['base_channel_label'] = ''
+
if keydetails['usage_limit'] != 0:
newkey = self.client.activationkey.create(self.session,
keyname,
commit 3dfd65d8b0a98e9a6ada67d537522469c9dc94db
Author: Steven Hardy <shardy(a)redhat.com>
Date: Thu May 24 13:51:10 2012 +0100
spacecmd bugfix : Fix reference to non-existent variable
json_read_from_file refers to verbose in the exception handler, we should
just print the error message whenever we hit an exception
Signed-off-by: Steven Hardy <shardy(a)redhat.com>
diff --git a/spacecmd/src/lib/utils.py b/spacecmd/src/lib/utils.py
index 21f6c92..1cee588 100644
--- a/spacecmd/src/lib/utils.py
+++ b/spacecmd/src/lib/utils.py
@@ -631,8 +631,7 @@ def json_read_from_file(filename):
except:
print "could not read in data from %s" % filename
except IOError, E:
- if verbose:
- print "could not open file %s for reading, check permissions?" % filename
+ print "could not open file %s for reading, check permissions?" % filename
return None
commit 760b2bde82d5ca5b2170166c0fbe84d8fe631e08
Author: Steven Hardy <shardy(a)redhat.com>
Date: Thu May 24 12:01:26 2012 +0100
spacecmd bugfix : improve configchannel_export operation on old API versions
configchannel_export fails to export anything on the satellite 5.3 API version
when certain problematic files are encountered. This modification should make
a "best effort" to export on early API versions, while still working as-before
on more recent, less broken API versions.
Signed-off-by: Steven Hardy <shardy(a)redhat.com>
diff --git a/spacecmd/src/lib/configchannel.py b/spacecmd/src/lib/configchannel.py
index 9a27d04..642e6b4 100644
--- a/spacecmd/src/lib/configchannel.py
+++ b/spacecmd/src/lib/configchannel.py
@@ -801,9 +801,23 @@ def export_configchannel_getdetails(self, channel):
files = self.client.configchannel.listFiles(self.session, channel)
details['files'] = []
paths = [f['path'] for f in files]
- logging.debug("Found files %s for %s" % (paths, channel))
- fileinfo = self.client.configchannel.lookupFileInfo(self.session, \
- channel, paths)
+ fileinfo = []
+ # Some versions of the API blow up when lookupFileInfo is asked to
+ # return details of files containing non-XML-valid characters.
+ # later API versions simply return empty file contents, but to
+ # ensure the least-bad operation with older (sat 5.3) API versions
+ # we can iterate over each file, then we just error on individual files
+ # instead of failing to export anything at all...
+ for p in paths:
+ logging.debug("Found file %s for %s" % (p, channel))
+ try:
+ pinfo = self.client.configchannel.lookupFileInfo(self.session,
+ channel, [ p ])
+ if len(pinfo):
+ fileinfo.append(pinfo[0])
+ except:
+ logging.error("Failed to get details for file %s from %s"
+ % (p, channel))
# Now we strip the datetime fields from the Info structs, as they
# are not JSON serializable with the default encoder, and we don't
# need them on import anyway
commit b0fb505f60a23cfc6f1025c0515872d6a1dfcaba
Author: Steven Hardy <shardy(a)redhat.com>
Date: Thu May 24 11:12:52 2012 +0100
spacecmd bugfix : *diff functions allow python 2.4 compatibility
Modify get_normalized_text implementation so it works with python 2.4
for compatibility with EL5 satellite deployments
Signed-off-by: Steven Hardy <shardy(a)redhat.com>
diff --git a/spacecmd/src/lib/utils.py b/spacecmd/src/lib/utils.py
index c9d4c4a..21f6c92 100644
--- a/spacecmd/src/lib/utils.py
+++ b/spacecmd/src/lib/utils.py
@@ -710,7 +710,11 @@ def get_normalized_text( text, replacedict=None, excludes=None ):
if text:
for string in text:
for line in string.split( "\n" ):
- if not excludes or not line.startswith( tuple(excludes) ):
+ if not excludes:
+ normalized_text.append( replace( line, replacedict ) )
+ # We do it this way instead of passing a tuple to
+ # line.startswith to allow compatibility with python 2.4
+ elif not [ e for e in excludes if line.startswith(e) ]:
normalized_text.append( replace( line, replacedict ) )
else:
logging.debug( "excluding line: " + line )
11 years, 11 months
Changes to 'refs/tags/spacewalk-schema-1.8.39-1'
by Miroslav Suchý
Tag 'spacewalk-schema-1.8.39-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-05-24 10:15 +0000
Tagging package [spacewalk-schema] version [1.8.39-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.8.72-1:
Miroslav Suchý (2):
719609 - correct channel arch for armv7
Automatic commit of package [spacewalk-schema] release [1.8.39-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/036-support-for-armv7.sql | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
11 years, 11 months
2 commits - rel-eng/packages schema/spacewalk
by Miroslav Suchý
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 48033c721a4df7245c7e795e941ca812d4c2b2e3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 24 12:15:49 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.39-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 88ed5ab..30b3ce0 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.38-1 schema/spacewalk/
+1.8.39-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index f0c32db..ad804a2 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.38
+Version: 1.8.39
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu May 24 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.39-1
+- 719609 - correct channel arch for armv7
+
* Wed May 23 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.38-1
- 719609 - correct server arch for armv7
commit 1331e0f61e5c6d9db659c96c284c13432ec5ba34
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 24 12:15:31 2012 +0200
719609 - correct channel arch for armv7
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql
index bca7602..0f9eb3e 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql
@@ -11,7 +11,7 @@ insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
values (LOOKUP_CHANNEL_ARCH('channel-armhfp'), LOOKUP_PACKAGE_ARCH('armv7hl'));
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
- values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('noarch'));
+ values (LOOKUP_CHANNEL_ARCH('channel-armhfp'), LOOKUP_PACKAGE_ARCH('noarch'));
insert into rhnServerArch (id, label, name, arch_type_id) values
(sequence_nextval('rhn_server_arch_id_seq'), 'armv7l-redhat-linux', 'armv7l', lookup_arch_type('rpm'));
11 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.8.72-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.72-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-05-24 10:12 +0000
Tagging package [spacewalk-java] version [1.8.72-1] in directory [java/].
Changes since spacewalk-utils-1.8.16-1:
Tomas Lestach (3):
fix ConfigTestUtils.createConfigRevision
fix ConfigurationManagerTest.testCopyFile
Automatic commit of package [spacewalk-java] release [1.8.72-1].
---
java/code/src/com/redhat/rhn/domain/config/ConfigChannel.java | 3 -
java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java | 17 ++++++----
java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java | 2 -
java/code/src/com/redhat/rhn/testing/ConfigTestUtils.java | 3 -
java/spacewalk-java.spec | 6 ++-
rel-eng/packages/spacewalk-java | 2 -
6 files changed, 20 insertions(+), 13 deletions(-)
---
11 years, 11 months
3 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/config/ConfigChannel.java | 3 -
java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java | 17 ++++++----
java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java | 2 -
java/code/src/com/redhat/rhn/testing/ConfigTestUtils.java | 3 -
java/spacewalk-java.spec | 6 ++-
rel-eng/packages/spacewalk-java | 2 -
6 files changed, 20 insertions(+), 13 deletions(-)
New commits:
commit 27736228af802102aebafc3aa2d39752ac03680d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 24 12:12:28 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.72-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c5b872d..67a99e8 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.71
+Version: 1.8.72
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu May 24 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.72-1
+- fix ConfigurationManagerTest.testCopyFile
+- fix ConfigTestUtils.createConfigRevision
+
* Mon May 21 2012 Jan Pazdziora 1.8.71-1
- %%defattr is not needed since rpm 4.4
- Fix incorrect text fields.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e953573..b7ace5c 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.71-1 java/
+1.8.72-1 java/
commit 38295d46216af56a6ff517de30c4a169c874aeb4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 24 11:11:19 2012 +0200
fix ConfigurationManagerTest.testCopyFile
and some config stuff
diff --git a/java/code/src/com/redhat/rhn/domain/config/ConfigChannel.java b/java/code/src/com/redhat/rhn/domain/config/ConfigChannel.java
index c1f7021..b08f9c4 100644
--- a/java/code/src/com/redhat/rhn/domain/config/ConfigChannel.java
+++ b/java/code/src/com/redhat/rhn/domain/config/ConfigChannel.java
@@ -224,8 +224,7 @@ public class ConfigChannel extends BaseDomainHelper implements Identifiable {
file.setConfigFileName(cfn);
file.setCreated(new Date());
file.setModified(new Date());
- ConfigurationFactory.commit(file);
- return file;
+ return ConfigurationFactory.commit(file);
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java b/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java
index 7121e5d..b14ec06 100644
--- a/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java
@@ -157,8 +157,9 @@ public class ConfigurationFactory extends HibernateFactory {
* attached to it. config channels also used stored procedures for
* insertions, so we can't simply ask hibernate to save it for us.
* @param file The configuration file to persist
+ * @return config file id
*/
- public static void saveNewConfigFile(ConfigFile file) {
+ public static Long saveNewConfigFile(ConfigFile file) {
//This is designed to catch some of the cases in which the config channel
//was not saved before the config file.
//There is still the possibility that the config channel hasn't been committed to
@@ -186,7 +187,7 @@ public class ConfigurationFactory extends HibernateFactory {
outParams.put("configFileId", new Integer(Types.NUMERIC));
Map result = m.execute(inParams, outParams);
- file.setId((Long)result.get("configFileId"));
+ return (Long)result.get("configFileId");
}
/**
@@ -278,15 +279,18 @@ public class ConfigurationFactory extends HibernateFactory {
* use a stored procedure for inserting, we have to decide whether to
* insert or update here. If the file's id is null, we insert.
* @param file The file to save or update
+ * @return config file
*/
- public static void commit(ConfigFile file) {
+ public static ConfigFile commit(ConfigFile file) {
commit(file.getConfigChannel());
if (file.getId() == null) {
- saveNewConfigFile(file);
+ Long fileId = saveNewConfigFile(file);
+ file = (ConfigFile) getSession().get(ConfigFile.class, fileId);
}
else {
save(file);
}
+ return file;
}
/**
@@ -786,7 +790,7 @@ public class ConfigurationFactory extends HibernateFactory {
//Step 5
revision.setId(null);
- commit(revision);
+ revision = commit(revision);
file.setLatestConfigRevision(revision);
commit(file);
@@ -903,6 +907,7 @@ public class ConfigurationFactory extends HibernateFactory {
file.setConfigFileState(ConfigFileState.normal());
file.setCreated(new Date());
file.setModified(new Date());
+ file = commit(file);
}
else {
rev = getNextRevisionForFile(file);
@@ -918,7 +923,7 @@ public class ConfigurationFactory extends HibernateFactory {
newRevision.setConfigFile(file);
//Step 4
- commit(newRevision);
+ newRevision = commit(newRevision);
file.setLatestConfigRevision(newRevision);
commit(file);
}
diff --git a/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java b/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java
index 0ce68cb..0260128 100644
--- a/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java
+++ b/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java
@@ -440,7 +440,7 @@ public abstract class ConfigFileData {
cRevision.getConfigFile().getConfigFileName().getPath()) &&
getOwner().equals(cInfo.getUsername()) &&
getGroup().equals(cInfo.getGroupname()) &&
- getPermissions().equals(cInfo.getFilemode().toString()) &&
+ Long.valueOf(getPermissions()).equals(cInfo.getFilemode()) &&
((StringUtils.isEmpty(cfdSelinuxCtx) && StringUtils.isEmpty(crSelinuxCtx)) ||
cfdSelinuxCtx.equals(crSelinuxCtx));
}
commit 87f03bc923e346eeec20a39785598b3945ae874e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 23 11:33:30 2012 +0200
fix ConfigTestUtils.createConfigRevision
ome commit to fix them all:
TEST com.redhat.rhn.domain.action.config.test.ConfigActionTest
TEST com.redhat.rhn.domain.action.config.test.ConfigRevisionActionTest
TEST com.redhat.rhn.domain.action.test.ActionFactoryTest
TEST com.redhat.rhn.domain.config.test.ConfigRevisionTest
TEST com.redhat.rhn.domain.config.test.ConfigurationFactoryTest
TEST com.redhat.rhn.frontend.action.configuration.ssm.test.ConfigListActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.CompareChannelActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.CompareCopyActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.CompareDeployedActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.CompareRevisionActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.CopyFileLocalActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.CopyFileSandboxActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.CopyFilesCentralActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.DeleteRevisionActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.FileDetailsActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.FileDownloadActionTest
TEST com.redhat.rhn.frontend.action.configuration.test.LocalRevisionDeployActionTest
TEST com.redhat.rhn.frontend.action.schedule.test.ActionSystemsSetupActionTest
TEST com.redhat.rhn.frontend.xmlrpc.configchannel.test.ConfigChannelHandlerTest
TEST com.redhat.rhn.frontend.xmlrpc.system.config.test.ServerConfigHandlerTest
diff --git a/java/code/src/com/redhat/rhn/testing/ConfigTestUtils.java b/java/code/src/com/redhat/rhn/testing/ConfigTestUtils.java
index 264e4ae..b81cd30 100644
--- a/java/code/src/com/redhat/rhn/testing/ConfigTestUtils.java
+++ b/java/code/src/com/redhat/rhn/testing/ConfigTestUtils.java
@@ -208,8 +208,7 @@ public class ConfigTestUtils extends Assert {
cr.setConfigFile(file);
cr.setConfigInfo(info);
cr.setConfigFileType(type);
- ConfigurationFactory.commit(cr);
- return cr;
+ return ConfigurationFactory.commit(cr);
}
/**
11 years, 11 months
Changes to 'refs/tags/spacewalk-utils-1.8.16-1'
by StephenHerr
Tag 'spacewalk-utils-1.8.16-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-05-23 19:21 +0000
Tagging package [spacewalk-utils] version [1.8.16-1] in directory [utils/].
Changes since spacewalk-schema-1.8.38-1:
Stephen Herr (2):
824583 - spacewalk-clone-by-date failes with TypeError when on Postgres database.
Automatic commit of package [spacewalk-utils] release [1.8.16-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/cloneByDate.py | 2 +-
utils/spacewalk-utils.spec | 6 +++++-
3 files changed, 7 insertions(+), 3 deletions(-)
---
11 years, 11 months
rel-eng/packages utils/spacewalk-utils.spec
by StephenHerr
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 2e8baedfcf292d7d0f4dbe0e4b2d834a782a4b1c
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed May 23 15:21:29 2012 -0400
Automatic commit of package [spacewalk-utils] release [1.8.16-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index feee70b..a53e6f2 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.8.15-1 utils/
+1.8.16-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 37f394c..9d8c4ee 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.8.15
+Version: 1.8.16
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -86,6 +86,10 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Wed May 23 2012 Stephen Herr <sherr(a)redhat.com> 1.8.16-1
+- 824583 - spacewalk-clone-by-date failes with TypeError when on Postgres
+ database.
+
* Mon May 21 2012 Jan Pazdziora 1.8.15-1
- Fix refsection build error.
- %%defattr is not needed since rpm 4.4
11 years, 11 months
utils/cloneByDate.py
by StephenHerr
utils/cloneByDate.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7e066ddf8b08acc67f2f0eab80545edf600ed728
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed May 23 15:17:07 2012 -0400
824583 - spacewalk-clone-by-date failes with TypeError when on Postgres database.
The Postgres database returns a datetime object with a timezone, whereas oracle returnes one without.
The tool then tries to comparte it with a datetime that has no timezone info, which is illegal. The fix is to simply compare date objects instead of datetime objects. This is safe because Errata release time are actually dates, there is no time associated with them.
diff --git a/utils/cloneByDate.py b/utils/cloneByDate.py
index f93e964..c4f0fe1 100644
--- a/utils/cloneByDate.py
+++ b/utils/cloneByDate.py
@@ -503,7 +503,7 @@ class ChannelCloner:
to_clone = []
for err in available_errata:
- if err['issue_date'] <= self.to_date:
+ if err['issue_date'].date() <= self.to_date.date():
to_clone.append(err)
return (to_clone, available_errata)
11 years, 11 months
Changes to 'refs/tags/spacewalk-schema-1.8.38-1'
by Miroslav Suchý
Tag 'spacewalk-schema-1.8.38-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-05-23 11:36 +0000
Tagging package [spacewalk-schema] version [1.8.38-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-1.8.37-1:
Miroslav Suchý (2):
719609 - correct server arch for armv7
Automatic commit of package [spacewalk-schema] release [1.8.38-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/common/data/rhnServerPackageArchCompat.sql | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/050-rhnServerPackageArchCompat.sql | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
---
11 years, 11 months
2 commits - rel-eng/packages schema/spacewalk
by Miroslav Suchý
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/common/data/rhnServerPackageArchCompat.sql | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/050-rhnServerPackageArchCompat.sql | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 25c3e7fb70cfcb89a54708226862a37be109f8eb
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 23 13:36:49 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.38-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index f87de19..88ed5ab 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.37-1 schema/spacewalk/
+1.8.38-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index d35318c..f0c32db 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.37
+Version: 1.8.38
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed May 23 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.38-1
+- 719609 - correct server arch for armv7
+
* Wed May 23 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.37-1
- 719609 - fix errors from previous ARM commits
commit 33cfb8757e32deba5962c0904016798b8e748a4b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 23 13:35:26 2012 +0200
719609 - correct server arch for armv7
addressing:
(LOOKUP_SERVER_ARCH('armv7-redhat-linux'), LOOKUP_PACKAGE_ARCH('noarch'), 1000)
*
ERROR at line 3:
ORA-20244: (server_arch_not_found) - Server architecture could not be found
ORA-06512: at "SPACEWALK.RHN_EXCEPTION", line 31
ORA-06512: at "SPACEWALK.LOOKUP_SERVER_ARCH", line 15
diff --git a/schema/spacewalk/common/data/rhnServerPackageArchCompat.sql b/schema/spacewalk/common/data/rhnServerPackageArchCompat.sql
index 228688d..af6d213 100644
--- a/schema/spacewalk/common/data/rhnServerPackageArchCompat.sql
+++ b/schema/spacewalk/common/data/rhnServerPackageArchCompat.sql
@@ -103,7 +103,7 @@ insert into rhnServerPackageArchCompat
insert into rhnServerPackageArchCompat
(server_arch_id, package_arch_id, preference) values
-(LOOKUP_SERVER_ARCH('armv7-redhat-linux'), LOOKUP_PACKAGE_ARCH('noarch'), 1000);
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_PACKAGE_ARCH('noarch'), 1000);
insert into rhnServerPackageArchCompat
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/050-rhnServerPackageArchCompat.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/050-rhnServerPackageArchCompat.sql
index 4f4b0b4..b762909 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/050-rhnServerPackageArchCompat.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/050-rhnServerPackageArchCompat.sql
@@ -20,7 +20,7 @@ insert into rhnServerPackageArchCompat
insert into rhnServerPackageArchCompat
(server_arch_id, package_arch_id, preference) values
-(LOOKUP_SERVER_ARCH('armv7-redhat-linux'), LOOKUP_PACKAGE_ARCH('noarch'), 1000);
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_PACKAGE_ARCH('noarch'), 1000);
insert into rhnServerPackageArchCompat
11 years, 11 months