backend/common backend/server
by Partha Aji
backend/common/rhnException.py | 2
backend/server/handlers/config_mgmt/rhn_config_management.py | 30 +++++++++--
2 files changed, 28 insertions(+), 4 deletions(-)
New commits:
commit b09b48ac2208918350a9dd9e32aac120adb30d36
Author: Partha Aji <paji(a)redhat.com>
Date: Tue Aug 3 17:53:37 2010 -0400
got the rhncfg manager diff revisions to work with symlinks
diff --git a/backend/common/rhnException.py b/backend/common/rhnException.py
index c502ad3..b1dc99a 100644
--- a/backend/common/rhnException.py
+++ b/backend/common/rhnException.py
@@ -322,6 +322,8 @@ maximum membership exceeded"),
4013: _("File already uploaded to configuration channel"),
4014: _("File size exceeds remaining quota space"),
4015: _("Full path of file must be specified"),
+ 4016: _("Invalid revision number"),
+ 4017: _("Cannot compare files of different file type"),
# 5000 - 5099: entitlement mapper errors
5000: _("The speicified item is not present in the input"),
diff --git a/backend/server/handlers/config_mgmt/rhn_config_management.py b/backend/server/handlers/config_mgmt/rhn_config_management.py
index 04d50fe..71dccef 100644
--- a/backend/server/handlers/config_mgmt/rhn_config_management.py
+++ b/backend/server/handlers/config_mgmt/rhn_config_management.py
@@ -466,8 +466,8 @@ class ConfigManagement(configFilesHandler.ConfigFilesHandler):
config_channel_src = dict['config_channel_src']
revision_src = dict.get('revision_src')
if revision_src and not revision_src.isdigit():
- raise rhnFault(4011, "File %s (revision %s) does not exist "
- "in channel %s" % (path, revision_src, config_channel_src),
+ raise rhnFault(4016, "Invalid revision number '%s' specified for path %s "
+ "in channel %s" % (revision_src, path, config_channel_src),
explain=0)
fsrc = self._get_file(config_channel_src, path, revision=revision_src)
@@ -496,8 +496,8 @@ class ConfigManagement(configFilesHandler.ConfigFilesHandler):
config_channel_dst = config_channel_src
revision_dst = dict.get('revision_dst')
if revision_dst and not revision_dst.isdigit():
- raise rhnFault(4011, "File %s (revision %s) does not exist "
- "in channel %s" % (path, revision_dst, config_channel_dst),
+ raise rhnFault(4016, "Invalid revision number '%s' specified for path %s "
+ "in channel %s" % (revision_dst, path, config_channel_dst),
explain=0)
# revision_dst may be None, in which case we diff with HEAD
fdst = self._get_file(config_channel_dst, path, revision=revision_dst)
@@ -517,6 +517,27 @@ class ConfigManagement(configFilesHandler.ConfigFilesHandler):
os.close(fd)
del fc_lob
+ if fsrc['label'] != fdst['label']:
+ raise rhnFault(4017, "Path %s is a %s"+ \
+ " in channel %s while it is a %s in channel %s"\
+ % (path, fsrc['label'], \
+ config_channel_src, fdst['label'], config_channel_dst),
+ explain=0)
+ template = "--- %s\t%s\tconfig channel: %s\trevision: %s target: %s \n"
+
+ if fsrc['label'] == 'symlink':
+ if fsrc["symlink"] != fdst['symlink']:
+ first_row = template % (
+ path, f_date(fsrc['modified']), config_channel_src,
+ fsrc['revision'], fsrc["symlink"],
+ )
+ second_row = template % (
+ path, f_date(fdst['modified']), config_channel_dst,
+ fdst['revision'], fdst["symlink"],
+ )
+ return first_row + second_row
+ return ""
+
pipe = os.popen("/usr/bin/diff -u %s %s" % (filename_src,
filename_dst))
first_row = pipe.readline()
@@ -533,6 +554,7 @@ class ConfigManagement(configFilesHandler.ConfigFilesHandler):
return second_row + pipe.read()
template = "--- %s\t%s\tconfig channel: %s\trevision: %s\n"
+
first_row = template % (
path, f_date(fsrc['modified']), config_channel_src,
fsrc['revision'],
13 years, 9 months
backend/server
by Partha Aji
backend/server/handlers/config_mgmt/rhn_config_management.py | 17 ++++++++---
1 file changed, 13 insertions(+), 4 deletions(-)
New commits:
commit f9d489d174f867dfeec83f78ef8b40ae86dcb688
Author: Partha Aji <paji(a)redhat.com>
Date: Tue Aug 3 16:40:26 2010 -0400
Fixed config_mgmt diff stuff
diff --git a/backend/server/handlers/config_mgmt/rhn_config_management.py b/backend/server/handlers/config_mgmt/rhn_config_management.py
index 41bce45..04d50fe 100644
--- a/backend/server/handlers/config_mgmt/rhn_config_management.py
+++ b/backend/server/handlers/config_mgmt/rhn_config_management.py
@@ -19,7 +19,7 @@
import os
from common import rhnFault, log_debug
-
+import tempfile
from server import rhnSQL, configFilesHandler
class ConfigManagement(configFilesHandler.ConfigFilesHandler):
@@ -464,7 +464,12 @@ class ConfigManagement(configFilesHandler.ConfigFilesHandler):
path = dict['path']
config_channel_src = dict['config_channel_src']
- revision_src = dict['revision_src']
+ revision_src = dict.get('revision_src')
+ if revision_src and not revision_src.isdigit():
+ raise rhnFault(4011, "File %s (revision %s) does not exist "
+ "in channel %s" % (path, revision_src, config_channel_src),
+ explain=0)
+
fsrc = self._get_file(config_channel_src, path, revision=revision_src)
if not fsrc:
raise rhnFault(4011, "File %s (revision %s) does not exist "
@@ -481,7 +486,7 @@ class ConfigManagement(configFilesHandler.ConfigFilesHandler):
# Empty files or directories may have NULL instead of lobs
fd, filename_src = tempfile.mkstemp(prefix = '/tmp/rhncfg-')
- fc_lob = fsrc['file_contents']
+ fc_lob = fsrc.get('file_contents')
if fc_lob:
os.write(fd, rhnSQL.read_lob(fc_lob))
os.close(fd)
@@ -490,6 +495,10 @@ class ConfigManagement(configFilesHandler.ConfigFilesHandler):
if config_channel_dst is None:
config_channel_dst = config_channel_src
revision_dst = dict.get('revision_dst')
+ if revision_dst and not revision_dst.isdigit():
+ raise rhnFault(4011, "File %s (revision %s) does not exist "
+ "in channel %s" % (path, revision_dst, config_channel_dst),
+ explain=0)
# revision_dst may be None, in which case we diff with HEAD
fdst = self._get_file(config_channel_dst, path, revision=revision_dst)
if not fdst:
@@ -502,7 +511,7 @@ class ConfigManagement(configFilesHandler.ConfigFilesHandler):
explain=0)
fd, filename_dst = tempfile.mkstemp(prefix = '/tmp/rhncfg-')
- fc_lob = fdst['file_contents']
+ fc_lob = fdst.get('file_contents')
if fc_lob:
os.write(fd, rhnSQL.read_lob(fc_lob))
os.close(fd)
13 years, 9 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java | 9 ++++-----
java/code/src/com/redhat/rhn/domain/config/ConfigContent.java | 3 ++-
java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java | 6 ++++--
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 3 ++-
4 files changed, 12 insertions(+), 9 deletions(-)
New commits:
commit 4eb7cd49937c99919dbc6dc4ba71c99aaaa8a9cf
Author: Partha Aji <paji(a)redhat.com>
Date: Tue Aug 3 14:37:45 2010 -0400
Fixed byte[] -> string conversion bugs that were created during the blob->binary commit
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java b/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
index b78ba13..bf7ff61 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
@@ -490,7 +490,7 @@ public abstract class HibernateFactory {
*/
public static String getByteArrayContents(byte[] barr) {
- String retval = null;
+ String retval = "";
if (barr != null) {
try {
@@ -527,18 +527,18 @@ public abstract class HibernateFactory {
}
/**
- * Convert a String to a Blob object. Guards against
+ * Convert a String to a byte[] object. Guards against
* null arrays and 0 length arrays.
* @param data string to convert to a Blob
* @return Blob if data[] is non-null and length > 0, null otherwise
*/
- public static Blob stringToBlob(String data) {
+ public static byte[] stringToByteArray(String data) {
if (StringUtils.isEmpty(data)) {
return null;
}
try {
- return byteArrayToBlob(data.getBytes("UTF-8"));
+ return data.getBytes("UTF-8");
}
catch (UnsupportedEncodingException e) {
throw new RuntimeException("Illegal Argument: " +
@@ -547,7 +547,6 @@ public abstract class HibernateFactory {
}
}
-
/**
* Initialize the underlying db layer
*
diff --git a/java/code/src/com/redhat/rhn/domain/config/ConfigContent.java b/java/code/src/com/redhat/rhn/domain/config/ConfigContent.java
index 12dd796..e0e5adb 100644
--- a/java/code/src/com/redhat/rhn/domain/config/ConfigContent.java
+++ b/java/code/src/com/redhat/rhn/domain/config/ConfigContent.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.domain.config;
+import com.redhat.rhn.common.hibernate.HibernateFactory;
import com.redhat.rhn.domain.BaseDomainHelper;
import com.redhat.rhn.domain.common.Checksum;
@@ -77,7 +78,7 @@ public class ConfigContent extends BaseDomainHelper {
* @return String version of the Contents content
*/
public String getContentsString() {
- return new String(contents);
+ return HibernateFactory.getByteArrayContents(getContents());
}
diff --git a/java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java b/java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java
index 96916b4..c88f32b 100644
--- a/java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java
+++ b/java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.domain.server;
+import com.redhat.rhn.common.hibernate.HibernateFactory;
import com.redhat.rhn.domain.rhnpackage.PackageEvr;
import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory;
@@ -43,7 +44,7 @@ public class SatelliteServer extends Server {
*/
public String getCertString() {
if (cert != null) {
- return new String(cert);
+ return HibernateFactory.getByteArrayContents(cert);
}
return null;
}
@@ -60,7 +61,7 @@ public class SatelliteServer extends Server {
* @param aCert The cert to set.
*/
public void setCert(String aCert) {
- cert = aCert.getBytes();
+ cert = HibernateFactory.stringToByteArray(aCert);
}
/**
@@ -152,6 +153,7 @@ public class SatelliteServer extends Server {
/**
* {@inheritDoc}
*/
+ @Override
public boolean isSatellite() {
return true;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
index dbdf278..ee24588 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
@@ -91,6 +91,7 @@ public class DownloadFile extends DownloadAction {
private static final String CHANNEL = "cid";
/** {@inheritDoc} */
+ @Override
public ActionForward execute(ActionMapping mapping,
ActionForm formIn,
HttpServletRequest request,
@@ -589,7 +590,7 @@ public class DownloadFile extends DownloadAction {
if (!f.exists()) {
log.error("manualServeChecksum :: File not found: " + diskPath);
response.sendError(HttpServletResponse.SC_NOT_FOUND);
- return getStreamForText("".getBytes());
+ return getStreamForText(new byte[0]);
}
checksum = MD5Sum.getFileMD5Sum(f);
}
13 years, 9 months
Changes to 'refs/tags/spacewalk-java-1.1.44-1'
by Shannon Hughes
Tag 'spacewalk-java-1.1.44-1' created by Shannon Hughes <shughes(a)redhat.com> at 2010-08-03 15:48 +0000
Tagging package [spacewalk-java] version [1.1.44-1] in directory [java/].
Changes since spacewalk-schema-1.1.26-1:
Shannon Hughes (2):
we need to use epoch of 1 for 1.6.0 and greater
Automatic commit of package [spacewalk-java] release [1.1.44-1].
---
java/spacewalk-java.spec | 9 ++++++---
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
---
13 years, 9 months
java/spacewalk-java.spec rel-eng/packages
by Shannon Hughes
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 73068353f649f77742a62ef4a66c11f0de80d4e5
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Tue Aug 3 11:48:35 2010 -0400
Automatic commit of package [spacewalk-java] release [1.1.44-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6bb28c0..5600f01 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.1.43
+Version: 1.1.44
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -331,6 +331,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Aug 03 2010 Shannon Hughes <shughes(a)redhat.com> 1.1.44-1
+- we need to use epoch of 1 for 1.6.0 and greater according to fedora java package rules (shughes(a)redhat.com)
+
* Mon Aug 02 2010 Milan Zazrivec <mzazrivec(a)redhat.com> 1.1.43-1
- use objectweb-asm for Fedora-13 and beyond
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 05bc5a3..02bd027 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.1.43-1 java/
+1.1.44-1 java/
13 years, 9 months
java/spacewalk-java.spec
by Shannon Hughes
java/spacewalk-java.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5913db998d57e0a89956794359e01468700cb725
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Tue Aug 3 11:46:15 2010 -0400
we need to use epoch of 1 for 1.6.0 and greater
http://fedoraproject.org/wiki/Packaging:Java#BuildRequires_and_Requires
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6f79c4b..6bb28c0 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -32,8 +32,8 @@ Group: Applications/Internet
Requires: bcel
Requires: c3p0
Requires: hibernate3 >= 0:3.2.4
-Requires: java >= 0:1.6.0
-Requires: java-devel >= 0:1.6.0
+Requires: java >= 1:1.6.0
+Requires: java-devel >= 1:1.6.0
Requires: jakarta-commons-lang >= 0:2.1
Requires: jakarta-commons-codec
Requires: jakarta-commons-cli
13 years, 9 months
Changes to 'refs/tags/spacewalk-schema-1.1.26-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.1.26-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-08-03 14:00 +0000
Tagging package [spacewalk-schema] version [1.1.26-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-1.1.25-1:
Jan Pazdziora (2):
Chameleon does not support the NULL clause.
Automatic commit of package [spacewalk-schema] release [1.1.26-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/common/tables/rhnConfigInfo.sql | 8 ++++----
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
3 files changed, 9 insertions(+), 6 deletions(-)
---
13 years, 9 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 beff3e4625bd748bfb51417a1f53da4f006f6d0d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Aug 3 16:00:56 2010 +0200
Automatic commit of package [spacewalk-schema] release [1.1.26-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 222ff51..69d473a 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.1.25-1 schema/spacewalk/
+1.1.26-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 5102321..63d997b 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.1.25
+Version: 1.1.26
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Tue Aug 03 2010 Jan Pazdziora 1.1.26-1
+- Chameleon does not support the NULL clause, fix source.
+
* Tue Aug 03 2010 Milan Zazrivec <mzazrivec(a)redhat.com> 1.1.25-1
- Do not depend on cpp when sed works just as well
- The slash is not needed as it causes the create index command to be run for
13 years, 9 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/common/tables/rhnConfigInfo.sql | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 6e67d876225322073e1f9e4670ef9999758a1a2d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Aug 3 14:18:05 2010 +0200
Chameleon does not support the NULL clause.
diff --git a/schema/spacewalk/common/tables/rhnConfigInfo.sql b/schema/spacewalk/common/tables/rhnConfigInfo.sql
index 62761a8..f19a512 100644
--- a/schema/spacewalk/common/tables/rhnConfigInfo.sql
+++ b/schema/spacewalk/common/tables/rhnConfigInfo.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--2010 Red Hat, Inc.
--
-- This software is licensed to you under the GNU General Public License,
-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -19,9 +19,9 @@ CREATE TABLE rhnConfigInfo
id NUMBER NOT NULL
CONSTRAINT rhn_confinfo_id_pk PRIMARY KEY
USING INDEX TABLESPACE [[2m_tbs]],
- username VARCHAR2(32) NULL,
- groupname VARCHAR2(32) NULL,
- filemode NUMBER NULL,
+ username VARCHAR2(32),
+ groupname VARCHAR2(32),
+ filemode NUMBER,
symlink_target_filename_id NUMBER
CONSTRAINT rhn_confinfo_symlink_fk
REFERENCES rhnConfigFileName (id),
13 years, 9 months
Changes to 'refs/tags/spacewalk-schema-1.1.25-1'
by Milan Zazrivec
Tag 'spacewalk-schema-1.1.25-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2010-08-03 07:30 +0000
Tagging package [spacewalk-schema] version [1.1.25-1] in directory [schema/spacewalk/].
Changes since rhncfg-5.9.25-1:
Milan Zazrivec (1):
Automatic commit of package [spacewalk-schema] release [1.1.25-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
---
13 years, 9 months
