Changes to 'refs/tags/spacewalk-backend-1.2.39-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.2.39-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-10-27 07:46 +0000
Tagging package [spacewalk-backend] version [1.2.39-1] in directory [backend/].
Changes since spacewalk-setup-1.2.13-1:
Jan Pazdziora (21):
Method auth_org_access is not used in our code, removing as dead code.
Method build_sql_args is not called, removing.
Method channels_for_org not called, removing as dead code.
Removal of spacewalk-backend-upload-server makes check_package_exists unused, removing.
Exception PackageConflictError was only used in check_package_exists, removing.
Method check_unique_email (and __check_unique_email_db) not used anywhere, removing.
After removal of __check_unique_email_db, fault 102 is not longer used.
Removing function create_user from test.
Removing get_kickstart_label which does not seem to be used anywhere.
The method _line_value does not seem to be used in the test.
Method parse_url not used in backend, removing as dead code.
Function register_system not called, removing.
If remove_listener not in our code, remove(remove_listener).
That setup_old function in test does not seem to be called, we better remove it.
The sortHeaders is not called in our code base, removing.
The sql_exception_text utility function never called, seems like a dead code.
The _timeString0 function looks unused, we shall consider it a dead code.
Removal of spacewalk-backend-upload-server makes source_match not called anywhere, removing.
Six find_by_* functions do not seem to be called by our code, removing.
Previous commit leaves __single_query unused, removing.
Automatic commit of package [spacewalk-backend] release [1.2.39-1].
Justin Sherrill (6):
fixing broken query used by SSM System delete
fixing broken if statement in snippet
646892 - fixing issue where kickstart expiration would occur after current date and not scheduled date of kickstart
adding missing import
fixing query to run correctly, c.id was not valid because the join did not come directly after rhnChannel c
removing unneeded insmod on kickstart %pre script, since they are already loaded
Tomas Lestach (1):
removing need of setNvreUpper method in PackageOverview
---
backend/common/rhnException.py | 1
backend/satellite_tools/connection.py | 13 ---
backend/satellite_tools/syncLib.py | 4 -
backend/server/importlib/test/test_blob_update.py | 31 --------
backend/server/rhnChannel.py | 38 ----------
backend/server/rhnDependency.py | 32 --------
backend/server/rhnPackageUpload.py | 22 -----
backend/server/rhnSQL/sql_lib.py | 10 --
backend/server/rhnServer/server_kickstart.py | 22 -----
backend/server/rhnServer/server_token.py | 6 -
backend/server/rhnUser.py | 23 ------
backend/server/rhnVirtualization.py | 9 --
backend/server/test/misc_functions.py | 18 ----
backend/server/test/test-cx_Oracle-memleak.py | 8 --
backend/spacewalk-backend.spec | 29 +++++++
backend/spacewalk/common/rhn_rpm.py | 12 ---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 14 +--
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 4 -
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 5 -
java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 2
java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java | 10 +-
java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartUrlHelperTest.java | 4 -
java/conf/cobbler/snippets/keep_system_id | 7 -
rel-eng/packages/spacewalk-backend | 2
24 files changed, 51 insertions(+), 275 deletions(-)
---
13 years, 6 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 29 ++++++++++++++++++++++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 29 insertions(+), 2 deletions(-)
New commits:
commit 15fcf05fbe964675ebc7275521a19736f54dce89
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Oct 27 09:46:34 2010 +0200
Automatic commit of package [spacewalk-backend] release [1.2.39-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index cec23a3..9cef607 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.2.38
+Version: 1.2.39
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -670,6 +670,33 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Oct 27 2010 Jan Pazdziora 1.2.39-1
+- Previous commit leaves __single_query unused, removing.
+- Six find_by_* functions do not seem to be called by our code, removing.
+- Removal of spacewalk-backend-upload-server makes source_match not called
+ anywhere, removing.
+- The _timeString0 function looks unused, we shall consider it a dead code.
+- The sql_exception_text utility function never called, seems like a dead code.
+- The sortHeaders is not called in our code base, removing.
+- That setup_old function in test does not seem to be called, we better remove
+ it.
+- If remove_listener not in our code, remove(remove_listener).
+- Function register_system not called, removing.
+- Method parse_url not used in backend, removing as dead code.
+- The method _line_value does not seem to be used in the test.
+- Removing get_kickstart_label which does not seem to be used anywhere.
+- Removing function create_user from test.
+- After removal of __check_unique_email_db, fault 102 is not longer used.
+- Method check_unique_email (and __check_unique_email_db) not used anywhere,
+ removing.
+- Exception PackageConflictError was only used in check_package_exists,
+ removing.
+- Removal of spacewalk-backend-upload-server makes check_package_exists unused,
+ removing.
+- Method channels_for_org not called, removing as dead code.
+- Method build_sql_args is not called, removing.
+- Method auth_org_access is not used in our code, removing as dead code.
+
* Mon Oct 25 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.2.38-1
- 623966 - add man page for rhn-entitlement-report
- 623964 - add man page for update-packages
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 40c8710..6fb38f4 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.2.38-1 backend/
+1.2.39-1 backend/
13 years, 6 months
java/conf
by Justin Sherrill
java/conf/cobbler/snippets/keep_system_id | 7 -------
1 file changed, 7 deletions(-)
New commits:
commit 7a9e7080010c23fd3aa35e4c0c30c5d1cb471ad3
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Oct 26 13:41:26 2010 -0400
removing unneeded insmod on kickstart %pre script, since they are already loaded
diff --git a/java/conf/cobbler/snippets/keep_system_id b/java/conf/cobbler/snippets/keep_system_id
index 721cd7e..210aec5 100644
--- a/java/conf/cobbler/snippets/keep_system_id
+++ b/java/conf/cobbler/snippets/keep_system_id
@@ -3,13 +3,6 @@ echo "Saving RHN keys..." > /dev/ttyS0
SYSTEM_ID=/etc/sysconfig/rhn/systemid
rhn_keys_found=no
-insmod /lib/jbd.o
-insmod /lib/ext3.o
-
-if [ -f /lib/ext4.o ]; then
- insmod /lib/ext4.o
-fi
-
mkdir -p /tmp/rhn
drives=$(list-harddrives | awk '{print $1}')
13 years, 6 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit cd7de39f82159969c7ca0bb2ddeee8b6e56e5276
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Oct 26 13:32:27 2010 -0400
fixing query to run correctly, c.id was not valid because the join did not come directly after rhnChannel c
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
index f3636b4..2bbfdc9 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
@@ -276,10 +276,11 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<sql-query name="Channel.kickstartableChannels">
<![CDATA[SELECT {c.*}
- FROM rhnChannel c,
+ FROM rhnChannel c LEFT OUTER JOIN
+ rhnChannelCloned c_1_ ON c.id = c_1_.id,
rhnAvailableChannels ACh,
rhnChannelArch CA
- LEFT OUTER JOIN rhnChannelCloned c_1_ ON c.id = c_1_.id
+
WHERE CA.id = ACh.channel_arch_id
AND ACh.org_id = :org_id
AND ACH.channel_depth = 1
13 years, 6 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 2 +-
java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartUrlHelperTest.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 0007f5df801d70339b308873dc7588c7932ff1b5
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Oct 26 12:32:46 2010 -0400
adding missing import
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
index 4639f8b..f3636b4 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
@@ -276,7 +276,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<sql-query name="Channel.kickstartableChannels">
<![CDATA[SELECT {c.*}
- FROM rhnChannel {c},
+ FROM rhnChannel c,
rhnAvailableChannels ACh,
rhnChannelArch CA
LEFT OUTER JOIN rhnChannelCloned c_1_ ON c.id = c_1_.id
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartUrlHelperTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartUrlHelperTest.java
index 1869bb5..8dd9068 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartUrlHelperTest.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartUrlHelperTest.java
@@ -22,6 +22,8 @@ import com.redhat.rhn.domain.kickstart.test.KickstartSessionTest;
import com.redhat.rhn.manager.kickstart.KickstartUrlHelper;
import com.redhat.rhn.testing.TestUtils;
+import java.util.Date;
+
/**
* Test for urlhelper
13 years, 6 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 2 +-
java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java | 10 +++++-----
java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartUrlHelperTest.java | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit becad020047d0dae2c68381b998e306077129091
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Oct 26 11:20:31 2010 -0400
646892 - fixing issue where kickstart expiration would occur after current date and not scheduled date of kickstart
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
index a5c1dbc..47fb5bb 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
@@ -574,7 +574,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
CobblerSystemCreateCommand cmd =
getCobblerSystemCreateCommand(user, server,
ksdata, uhelper.
- getKickstartMediaPath(kickstartSession),
+ getKickstartMediaPath(kickstartSession, scheduleDate),
tokenList);
cmd.setKickstartHost(host);
cmd.setKernelOptions(getExtraOptions());
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java
index 008bc7a..5762ec1 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java
@@ -51,9 +51,9 @@ public class KickstartUrlHelper {
"/rhn/kickstart/KickstartFileDownloadAdvanced.do?ksid=%s";
private static final String KS_WIZARD_PAGE_URL =
"/rhn/kickstart/KickstartFileDownload.do?ksid=%s";
- private KickstartData ksData;
- private String host;
- private String protocol;
+ private final KickstartData ksData;
+ private final String host;
+ private final String protocol;
private KickstartableTree ksTree;
@@ -282,13 +282,13 @@ public class KickstartUrlHelper {
* @return String url to this KickstartData's media (packages, kernel
* etc...)
*/
- public String getKickstartMediaPath(KickstartSession session) {
+ public String getKickstartMediaPath(KickstartSession session, Date date) {
log.debug("Formatting for session use.");
// /ks/dist/session/
// 94xe86321bae3cb74551d995e5eafa065c0/ks-rhel-i386-as-4-u2
String file = getLongMediaPath(session);
TinyUrl turl = CommonFactory.createTinyUrl(file.toString(),
- new Date());
+ date);
CommonFactory.saveTinyUrl(turl);
log.debug("returning: " + turl.computeTinyPath());
return turl.computeTinyPath();
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartUrlHelperTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartUrlHelperTest.java
index 7faaebf..1869bb5 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartUrlHelperTest.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartUrlHelperTest.java
@@ -123,7 +123,7 @@ public class KickstartUrlHelperTest extends BaseKickstartCommandTestCase {
session = (KickstartSession) reload(session);
String encodedId = SessionSwap.encodeData(session.getId().toString());
String expected = "/ty/" + "";
- String url = helper.getKickstartMediaPath(session);
+ String url = helper.getKickstartMediaPath(session, new Date());
// "/ty/weOyQenH";
String token = url.substring(url.lastIndexOf("/"));
token = token.split("/")[1];
13 years, 6 months
2 commits - backend/server
by Jan Pazdziora
backend/server/rhnDependency.py | 32 --------------------------------
1 file changed, 32 deletions(-)
New commits:
commit 306edf396bef23106ec067fc642cfc973ce18caa
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 17:21:00 2010 +0200
Previous commit leaves __single_query unused, removing.
diff --git a/backend/server/rhnDependency.py b/backend/server/rhnDependency.py
index 2105dcb..f8f773e 100644
--- a/backend/server/rhnDependency.py
+++ b/backend/server/rhnDependency.py
@@ -299,17 +299,6 @@ class IncompleteLimitInfo(SolveDependenciesError):
class MakeEvrError(SolveDependenciesError):
pass
-def __single_query(server_id, deps, query):
- """ Now run one of those queries and return the results. """
- ret = {}
- # first prepare the statement
- h = rhnSQL.prepare(query)
- for dep in deps:
- h.execute(server_id = server_id, dep = dep)
- data = h.fetchall() or []
- ret[dep] = map(lambda a: a[:4], data)
- return ret
-
def __single_query_with_arch_and_id(server_id, deps, query):
""" Run one of the queries and return the results along with the arch. """
ret = {}
commit 2a790660ef3d8371c610c0fd5a9b75b5198e0c26
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 17:10:27 2010 +0200
Six find_by_* functions do not seem to be called by our code, removing.
diff --git a/backend/server/rhnDependency.py b/backend/server/rhnDependency.py
index 82a935f..2105dcb 100644
--- a/backend/server/rhnDependency.py
+++ b/backend/server/rhnDependency.py
@@ -378,27 +378,6 @@ def find_package_with_arch(server_id, deps):
log_debug(4, server_id, deps)
return __single_query_with_arch_and_id(server_id, deps, __packages_with_arch_and_id_sql)
-def find_by_packages(server_id, deps):
- log_debug(4, server_id, deps)
- return __single_query(server_id, deps, __packages_sql)
-def find_by_packages_all(server_id, deps):
- log_debug(4, server_id, deps)
- return __single_query(server_id, deps, __packages_all_sql)
-
-def find_by_provides(server_id, deps):
- log_debug(4, server_id, deps)
- return __single_query(server_id, deps, __provides_sql)
-def find_by_provides_all(server_id, deps):
- log_debug(4, server_id, deps)
- return __single_query(server_id, deps, __provides_all_sql)
-
-def find_by_files(server_id, deps):
- log_debug(4, server_id, deps)
- return __single_query(server_id, deps, __files_sql)
-def find_by_files_all(server_id, deps):
- log_debug(4, server_id, deps)
- return __single_query(server_id, deps, __files_all_sql)
-
def solve_dependencies_with_limits(server_id, deps, version, all = 0, limit_operator=None, limit = None):
""" This version of solve_dependencies allows the caller to get all of the packages that solve a dependency and limit
the packages that are returned to those that match the criteria defined by limit_operator and limit. This version
13 years, 6 months
7 commits - backend/satellite_tools backend/server backend/spacewalk
by Jan Pazdziora
backend/satellite_tools/syncLib.py | 4 --
backend/server/importlib/test/test_blob_update.py | 31 ----------------------
backend/server/rhnPackageUpload.py | 8 -----
backend/server/rhnServer/server_token.py | 6 ----
backend/server/rhnVirtualization.py | 9 ------
backend/server/test/misc_functions.py | 8 -----
backend/spacewalk/common/rhn_rpm.py | 12 --------
7 files changed, 78 deletions(-)
New commits:
commit e43dcf1bc30c0c9c3cfb0e91702308ef33a0feb1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 17:04:39 2010 +0200
Removal of spacewalk-backend-upload-server makes source_match not called anywhere, removing.
diff --git a/backend/server/rhnPackageUpload.py b/backend/server/rhnPackageUpload.py
index ff0dc66..c294d38 100644
--- a/backend/server/rhnPackageUpload.py
+++ b/backend/server/rhnPackageUpload.py
@@ -30,14 +30,6 @@ from spacewalk.server.rhnLib import get_package_path, \
from spacewalk.server.rhnServer import server_packages
from spacewalk.server.rhnSQL.const import ORACLE, POSTGRESQL
-def source_match(v1, v2):
- """ returns true if both parameters are true, false otherwise """
- if v1 and v2:
- return 1
- if not v1 and not v2:
- return 1
- return 0
-
def write_temp_file(req, buffer_size, packaging=None):
""" Write request to temporary file (write max. buffer_size at once).
commit ffd24f7634c511cfc8ecf74dd6f466fabfe2f577
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 17:02:25 2010 +0200
The _timeString0 function looks unused, we shall consider it a dead code.
diff --git a/backend/satellite_tools/syncLib.py b/backend/satellite_tools/syncLib.py
index 51210a4..679479b 100644
--- a/backend/satellite_tools/syncLib.py
+++ b/backend/satellite_tools/syncLib.py
@@ -59,10 +59,6 @@ class ReprocessingNeeded(Exception):
## 3 - a bit much
## 4+ - excessive
-def _timeString0():
- """time string as: "Mon Nov 18 12:56:34 2002" """
- return time.ctime(time.time())
-
def _timeString1():
"""time string as: "2002/11/18 12:56:34" """
return log_time()
commit a184fa55ed4c9cdf0b00ad2d989321fe56ef6b0d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 17:00:32 2010 +0200
The sql_exception_text utility function never called, seems like a dead code.
diff --git a/backend/server/rhnServer/server_token.py b/backend/server/rhnServer/server_token.py
index 014cb22..799ae0e 100644
--- a/backend/server/rhnServer/server_token.py
+++ b/backend/server/rhnServer/server_token.py
@@ -29,12 +29,6 @@ from server_lib import join_server_group
VIRT_ENT_LABEL = 'virtualization_host'
VIRT_PLATFORM_ENT_LABEL = 'virtualization_host_platform'
-# Convert a SQLError exception into the appropriate text
-def sql_exception_text(e):
- if isinstance(e, rhnSQL.SQLSchemaError):
- return e.errmsg
- return str(e)
-
# Handle channel subscriptions for the registration token
def token_channels(server, server_arch, tokens_obj):
assert(isinstance(tokens_obj, ActivationTokens))
commit 12a76e4b209da8deca8444d59571c316e832fdd2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:59:10 2010 +0200
The sortHeaders is not called in our code base, removing.
diff --git a/backend/spacewalk/common/rhn_rpm.py b/backend/spacewalk/common/rhn_rpm.py
index 9552151..8302bc4 100644
--- a/backend/spacewalk/common/rhn_rpm.py
+++ b/backend/spacewalk/common/rhn_rpm.py
@@ -355,18 +355,6 @@ def rpmLabelCompare(rpmFilename1, rpmFilename2):
get_package_header(rpmFilename2))
-def sortHeaders(hdrs):
- """ Sorts a list of RPM headers (or RPMs).
- Assertion: they *must* exist.
- """
-
- assert isinstance(hdrs, type([]))
-
- sorted = hdrs[:]
- sorted.sort(hdrLabelCompare)
- return sorted
-
-
def sortRPMs(rpms):
""" Sorts a list of RPM files. They *must* exist. """
commit 2ea8c3b3b95408a41a8edae584fe5a2d1635ee16
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:57:42 2010 +0200
That setup_old function in test does not seem to be called, we better remove it.
diff --git a/backend/server/importlib/test/test_blob_update.py b/backend/server/importlib/test/test_blob_update.py
index a9d9744..9900ded 100644
--- a/backend/server/importlib/test/test_blob_update.py
+++ b/backend/server/importlib/test/test_blob_update.py
@@ -127,37 +127,6 @@ def setup(table, blob_values, fields):
t.query(hash_values)
rhnSQL.commit()
-def setup_old(blob_values):
- h = rhnSQL.prepare("delete from test_blob_update")
- h.execute()
-
- h = rhnSQL.prepare("""
- insert into test_blob_update (id1, id2, val1, val2)
- values (:id1, :id2, empty_blob(), empty_blob())
- """)
- for v in blob_values:
- h.execute(id1=v[0], id2=v[1])
-
- q = "select val1, val2 from test_blob_update where id1 = :id1 and %s for update"
- for v in blob_values:
- i1 = v[0]
- i2 = v[1]
- hval = {'id1' : i1}
- if i2 is None:
- s = "id2 is null"
- else:
- s = "id2 = :id2"
- hval['id2'] = i2
- h = rhnSQL.prepare(q % s)
- apply(h.execute, (), hval)
- row = h.fetchone_dict()
- val1 = row['val1']
- val2 = row['val2']
- val1.write(v[2])
- val2.write(v[3])
-
- rhnSQL.commit()
-
def verify(blob_values):
q = """
select val1, val2 from test_blob_update where id1 = :id1 and %s
commit 4c99940be5f3b2b3fb74d5a9762cf1e5f1e2a1fe
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:55:46 2010 +0200
If remove_listener not in our code, remove(remove_listener).
diff --git a/backend/server/rhnVirtualization.py b/backend/server/rhnVirtualization.py
index c01ef9e..f6db269 100644
--- a/backend/server/rhnVirtualization.py
+++ b/backend/server/rhnVirtualization.py
@@ -128,15 +128,6 @@ def add_listener(listener):
if not listener in Listeners.listeners:
Listeners.listeners.append(listener)
-def remove_listener(listener):
- """
- Removes a virt event listener.
- """
- log_debug(3, "Virt listener removed: %s" % str(listener))
-
- if listener in Listeners.listeners:
- Listeners.listeners.remove(listener)
-
###############################################################################
# VirtualizationEventHandler Class
commit 33002e96318df785e5611d30b60ecd9d33b91614
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:44:59 2010 +0200
Function register_system not called, removing.
diff --git a/backend/server/test/misc_functions.py b/backend/server/test/misc_functions.py
index 1da2651..0f589e1 100644
--- a/backend/server/test/misc_functions.py
+++ b/backend/server/test/misc_functions.py
@@ -326,14 +326,6 @@ def build_sys_params_with_username(**kwargs):
del params['token']
return params
-def register_system( params ):
- data = registration.Registration().new_system(params)
- sysfile = open("/tmp/systemid", "w+")
- sysfile.write(data)
- sysfile.close()
-
- return data
-
def create_activation_key(org_id=None, user_id=None, groups=None,
13 years, 6 months
3 commits - backend/satellite_tools backend/server
by Jan Pazdziora
backend/satellite_tools/connection.py | 13 -------------
backend/server/rhnServer/server_kickstart.py | 22 ----------------------
backend/server/test/test-cx_Oracle-memleak.py | 8 +-------
3 files changed, 1 insertion(+), 42 deletions(-)
New commits:
commit 36f4526d39593b874ac36de3aa27975112931a23
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:41:07 2010 +0200
Method parse_url not used in backend, removing as dead code.
diff --git a/backend/satellite_tools/connection.py b/backend/satellite_tools/connection.py
index f14ce59..e7c7fc3 100644
--- a/backend/satellite_tools/connection.py
+++ b/backend/satellite_tools/connection.py
@@ -16,7 +16,6 @@
#
#
-import urllib
import string
import gzipstream
@@ -101,18 +100,6 @@ class GETServer(rpclib.GETServer):
_transport_class_proxy = ProxyTransport
_transport_class_https_proxy = SafeProxyTransport
-def parse_url(url):
- url_type, rest = urllib.splittype(url)
- if url_type is None:
- url_type = 'http'
- rest = '//' + rest
-
- url_type = string.lower(url_type)
-
- hostport, path = urllib.splithost(rest)
- host, port = urllib.splitport(hostport)
- return url_type, host, port, path
-
class CompressedStream:
"""
GzipStream will not close the connection by itself, so we have to keep the
commit ba9368ee2c25d6f798733dd4a31ff2f806fef22b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:38:47 2010 +0200
The method _line_value does not seem to be used in the test.
diff --git a/backend/server/test/test-cx_Oracle-memleak.py b/backend/server/test/test-cx_Oracle-memleak.py
index cc9a4e8..54483f1 100644
--- a/backend/server/test/test-cx_Oracle-memleak.py
+++ b/backend/server/test/test-cx_Oracle-memleak.py
@@ -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
@@ -34,12 +34,6 @@ def mem_usage():
dict[arr[0]] = arr[1]
return dict['Name'], dict['VmSize'], dict['VmRSS'], dict['VmData']
-def _line_value(line):
- arr = string.split(line, ':', 1)
- if len(arr) == 1:
- return None
- return string.strip(arr[1])
-
dbh = cx_Oracle.Connection(sys.argv[1])
h = dbh.cursor()
h.execute('select 1 from dual')
commit e33df1eb4bd4a7633ebb74e9339360c6e7329ef4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:35:05 2010 +0200
Removing get_kickstart_label which does not seem to be used anywhere.
diff --git a/backend/server/rhnServer/server_kickstart.py b/backend/server/rhnServer/server_kickstart.py
index 05a9007..7defef4 100644
--- a/backend/server/rhnServer/server_kickstart.py
+++ b/backend/server/rhnServer/server_kickstart.py
@@ -152,28 +152,6 @@ def get_kickstart_session_id(server_id, action_id):
return None
return row['id']
-_query_lookup_kickstart_label = rhnSQL.Statement("""
- select k.label
- from rhnKickstartSession ks, rhnKSData k
- where (
- (ks.old_server_id = :server_id and ks.new_server_id is NULL)
- or ks.new_server_id = :server_id
- or ks.host_server_id = :server_id
- )
- and ks.action_id = :action_id
- and k.id = ks.kickstart_id
-""")
-
-def get_kickstart_label(server_id, action_id):
- h = rhnSQL.prepare(_query_lookup_kickstart_label)
- h.execute(server_id=server_id, action_id=action_id)
-
- row = h.fetchone_dict()
- if not row:
- # Nothing to do
- return None
- return row['label']
-
_query_insert_package_delta = rhnSQL.Statement("""
13 years, 6 months
8 commits - backend/common backend/server
by Jan Pazdziora
backend/common/rhnException.py | 1
backend/server/rhnChannel.py | 38 ----------------------------------
backend/server/rhnPackageUpload.py | 14 ------------
backend/server/rhnSQL/sql_lib.py | 10 --------
backend/server/rhnUser.py | 23 --------------------
backend/server/test/misc_functions.py | 10 --------
6 files changed, 1 insertion(+), 95 deletions(-)
New commits:
commit 6978bcc3247cc8d6fd3f28cc200a40cd7cd8ddec
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:30:36 2010 +0200
Removing function create_user from test.
diff --git a/backend/server/test/misc_functions.py b/backend/server/test/misc_functions.py
index 120b121..1da2651 100644
--- a/backend/server/test/misc_functions.py
+++ b/backend/server/test/misc_functions.py
@@ -281,16 +281,6 @@ def new_server(user, org_id):
serv.save()
return serv
-def create_user(username, password, email=None, org_id=None, org_password=None):
- #reserved = rhnUser.reserve_user( username, password )
- #newuser = rhnUser.new_user( username, password, email, org_id, org_password )
- u = rhnUser.User( username, password )
- u.set_org_id( org_id )
- u.save()
- u.contact['password'] = password
- u.save()
- return u
-
class Counter:
_counter = 0
def value(self):
commit 24f64c6ff151738f37a1f3856bfd2ddd407fdc71
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:29:30 2010 +0200
After removal of __check_unique_email_db, fault 102 is not longer used.
diff --git a/backend/common/rhnException.py b/backend/common/rhnException.py
index b1dc99a..e94e648 100644
--- a/backend/common/rhnException.py
+++ b/backend/common/rhnException.py
@@ -204,7 +204,6 @@ maximum membership exceeded"),
# 100-109: e-mail and uuid related faults
100: _("Maximum e-mail length violation."),
101: _("Changing e-mail address is not supported."),
- 102: _("Unique e-mail address check failed."),
105: _("This system has been previously registered."),
106: _("Invalid username"),
commit 32a0b53f39077d717d5085fc50d5cf8bb0463171
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:27:52 2010 +0200
Method check_unique_email (and __check_unique_email_db) not used anywhere, removing.
diff --git a/backend/server/rhnUser.py b/backend/server/rhnUser.py
index a929b64..ec845bd 100644
--- a/backend/server/rhnUser.py
+++ b/backend/server/rhnUser.py
@@ -669,23 +669,6 @@ def check_email(email):
# XXX More to come (check the format is indeed foo(a)bar.baz
return email
-def check_unique_email(email):
- return __check_unique_email_db(email)
-
-def __check_unique_email_db(email):
- h = rhnSQL.prepare("""
- select 1
- from web_user_personal_info
- where email = :email
- """)
- h.execute(email=email)
- row = h.fetchone_dict()
- if row:
- # e-mail already exists
- raise rhnFault(102,
- _("A user with the supplied e-mail address (%s)\n"
- " is already registered with Red Hat Network") % email)
-
# Validates the given key against the current or old password
# If encrypted_password is false, it compares key with pwd1 and pwd2
# If encrypted_password is true, it compares the encrypted key
commit 858effb8087d78de357e3485237b37f0f9b10e12
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:26:03 2010 +0200
Exception PackageConflictError was only used in check_package_exists, removing.
diff --git a/backend/server/rhnPackageUpload.py b/backend/server/rhnPackageUpload.py
index 3f4b821..ff0dc66 100644
--- a/backend/server/rhnPackageUpload.py
+++ b/backend/server/rhnPackageUpload.py
@@ -323,6 +323,3 @@ def load_package(package_stream):
class AlreadyUploadedError(Exception):
pass
-class PackageConflictError(Exception):
- pass
-
commit eda85f78fa8f2a5039de351f67aa50db8b28bced
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:24:35 2010 +0200
Removal of spacewalk-backend-upload-server makes check_package_exists unused, removing.
diff --git a/backend/server/rhnPackageUpload.py b/backend/server/rhnPackageUpload.py
index 51377cc..3f4b821 100644
--- a/backend/server/rhnPackageUpload.py
+++ b/backend/server/rhnPackageUpload.py
@@ -326,14 +326,3 @@ class AlreadyUploadedError(Exception):
class PackageConflictError(Exception):
pass
-def check_package_exists(package_path, package_checksum_type, package_checksum, force=0):
- if not os.path.exists(package_path):
- return
- # File exists, same checksum?
- checksum = getFileChecksum(package_checksum_type, package_path)
- if package_checksum == checksum and not force:
- raise AlreadyUploadedError(package_path)
- if force:
- return
- raise PackageConflictError(package_path, package_checksum_type, checksum)
-
commit 58ea776054356a80dc32d62dcddfd356d4bd0243
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:22:58 2010 +0200
Method channels_for_org not called, removing as dead code.
diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py
index 2f1b29c..ae097ef 100644
--- a/backend/server/rhnChannel.py
+++ b/backend/server/rhnChannel.py
@@ -679,44 +679,6 @@ def get_base_channel(server_id, none_ok = 0):
return None
return __stringify(ret)
-# list the available channels for an org_id
-# We DO NOT want to cache this one because we depend on getting
-# accurate information and the caching would only introduce more
-# overhead on an otherwise very fast query
-def channels_for_org(org_id):
- if not org_id:
- org_id = ''
- org_id = string.strip(str(org_id))
- log_debug(3, org_id)
-
- # select channels this org can access
- h = rhnSQL.prepare("""
- select
- ca.label arch,
- c.id,
- c.parent_channel,
- c.org_id,
- c.label,
- c.name,
- c.summary,
- c.description,
- to_char(c.last_modified, 'YYYYMMDDHH24MISS') last_modified
- from
- rhnChannelArch ca
- rhnChannel c,
- rhnChannelPermissions cp
- where
- cp.org_id = :org_id
- and cp.channel_id = c.id
- and c.channel_arch_id = ca.id
- """)
- h.execute(org_id = org_id)
- ret = h.fetchall_dict()
- if not ret:
- return []
- # stringify for xmlrpc return
- return __stringify(ret)
-
def channels_for_server(server_id):
"""channel info list for all channels accessible by this server.
commit 432e42b20c86ea23e9efec69e5243c09587b405e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:18:31 2010 +0200
Method build_sql_args is not called, removing.
diff --git a/backend/server/rhnSQL/sql_lib.py b/backend/server/rhnSQL/sql_lib.py
index 358b084..529d2ee 100644
--- a/backend/server/rhnSQL/sql_lib.py
+++ b/backend/server/rhnSQL/sql_lib.py
@@ -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
@@ -32,14 +32,6 @@ from spacewalk.common.rhnTranslate import _
## FUNCTIONS
################
-# build a list of :pN arguments and a dictionary for complex SQL selects
-def build_sql_args(l):
- args = map(lambda a: "p%d" % a, range(len(l)))
- ret_dict = {}
- ret_str = string.join(map(lambda a: ":%s" % a, args), ", ")
- map(ret_dict.update, map(lambda a, b: { a: b }, args, l))
- return ret_str, ret_dict
-
# This statement builds a sql statement for an insert
# of 'items' into "table" indexed by "hash_name"
def build_sql_insert(table, hash_name, items):
commit 20c7a650a2ec17c3caa317052dc234b36a3c7d4d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:16:46 2010 +0200
Method auth_org_access is not used in our code, removing as dead code.
diff --git a/backend/server/rhnUser.py b/backend/server/rhnUser.py
index b379843..a929b64 100644
--- a/backend/server/rhnUser.py
+++ b/backend/server/rhnUser.py
@@ -386,12 +386,6 @@ def auth_username_password(username, password):
return user
-# placeholder for future OCS user <-> org access checks
-def auth_org_access(user_obj, org_id):
- if user_obj.contact["org_id"] != org_id:
- raise rhnFault(42)
-
-
def session_reload(session_string):
log_debug(4, session_string)
session = rhnSession.load(session_string)
13 years, 6 months