backend/common/rhn_memusage.py
| 5 -
backend/rhn-conf/rhn_server_satexport_internal.conf
| 6 -
backend/satellite_tools/exporter/exportLib.py
| 13 ---
backend/satellite_tools/exporter/exporter.py
| 5 -
backend/spacewalk-backend.spec
| 1
schema/spacewalk/common/tables/rhnSNPErrataQueue.sql
| 32 --------
schema/spacewalk/common/tables/rhnSNPServerQueue.sql
| 32 --------
schema/spacewalk/common/tables/tables.deps
| 2
schema/spacewalk/oracle/procs/delete_server.sql
| 1
schema/spacewalk/oracle/procs/procs.deps
| 3
schema/spacewalk/oracle/procs/queue_errata.sql
| 39 ----------
schema/spacewalk/postgres/procs/delete_server.sql
| 1
schema/spacewalk/postgres/procs/procs.deps
| 3
schema/spacewalk/postgres/procs/queue_errata.sql
| 33 --------
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/040-queue_errata-drop.sql
| 1
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/041-rhnSNPErrataQueue-drop.sql
| 1
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/042-rhnSNPServerQueue-drop.sql
| 1
spacewalk/certs-tools/timeLib.py
| 29 -------
18 files changed, 5 insertions(+), 203 deletions(-)
New commits:
commit aae3436540db70f419e53f7f3248d8c78fca9e79
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Sep 27 13:25:17 2010 +0200
nobody knows what does _baroquenLog() mean, removing
diff --git a/spacewalk/certs-tools/timeLib.py b/spacewalk/certs-tools/timeLib.py
index 2d0ca9e..e13ae85 100644
--- a/spacewalk/certs-tools/timeLib.py
+++ b/spacewalk/certs-tools/timeLib.py
@@ -327,35 +327,6 @@ def _test():
print e
-def _baroquenLog():
- """
- >>> import time
- >>> nowtup = time.gmtime()
- >>> nowstr = time.strftime('%b %d %H:%M:%S %Y', nowtup)
- >>> nowstr
- 'Jun 19 00:09:58 2004'
- >>> nowsec = time.mktime(nowtup)-time.timezone
- >>> time.gmtime(nowsec)
- (2004, 6, 19, 0, 9, 58, 5, 171, 0)
- >>> nowsec
- 1087603798.0
- >>> nowtup, nowsec_ = time.gmtime(), time.time()
- >>> nowstr = time.strftime('%b %d %H:%M:%S %Y', nowtup)
- >>> nowstr
- 'Jun 19 00:19:05 2004'
- >>> nowsec = time.mktime(nowtup)-time.timezone
- >>> nowsec
- 1087604345.0
- >>> nowsec_
- 1087604345.4773369
- >>> oneyear = nowsec+(356*24*60*60)
- >>> tup = time.gmtime(oneyear)
- >>> time.strftime('%b %d %H:%M:%S %Y', nowtup)
- 'Jun 19 00:19:05 2004'
- >>> time.strftime('%b %d %H:%M:%S %Y', tup)
- 'Jun 10 00:19:05 2005'
- """
-
if __name__ == '__main__':
_test()
commit 393bbb2bba5d48c38d67a545ed376b6d5c7abc1d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Sep 27 12:15:22 2010 +0200
validate_time() not used anywhere, removing dead code
diff --git a/backend/satellite_tools/exporter/exporter.py
b/backend/satellite_tools/exporter/exporter.py
index 356710a..95b7083 100644
--- a/backend/satellite_tools/exporter/exporter.py
+++ b/backend/satellite_tools/exporter/exporter.py
@@ -474,10 +474,5 @@ def patch_url(url, scheme='http', path=None):
return urlparse.urlunparse((_scheme, netloc, _path, params, query,
fragment))
-def validate_time(s):
- if s is None:
- return None
- return rhnLib.timestamp(s)
-
if __name__ == '__main__':
sys.exit(main() or 0)
commit d0051f914e26114147fb71b121df1c5163c24bc8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Sep 27 12:15:22 2010 +0200
errata_severity_cursor() not used anywhere, removing dead code
diff --git a/backend/satellite_tools/exporter/exportLib.py
b/backend/satellite_tools/exporter/exportLib.py
index 6b5f7b7..88a709e 100644
--- a/backend/satellite_tools/exporter/exportLib.py
+++ b/backend/satellite_tools/exporter/exportLib.py
@@ -1605,19 +1605,6 @@ def _errata_cursor(errata_id, synopsis):
def errata_cursor(errata_id):
return _errata_cursor(errata_id, "e.synopsis,")
-def errata_severity_cursor(errata_id):
- # include severity into synopsis before
- # exporting to satellite.
- # Also ignore the first 17 characters in
- # the label(errata.sev.label.) from
- # rhnErrataSeverity table
- synopsis = """
- (select SUBSTR(label,18) || ':'
- from rhnErrataSeverity
- where id = e.severity_id) || e.synopsis synposis,
- """
- return _errata_cursor(errata_id, synopsis)
-
class ChannelProductsDumper(BaseDumper):
def set_iterator(self):
commit 992185a94681a64f96ea861ce0750e1035550619
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Sep 27 12:15:22 2010 +0200
_line_value() not used anywhere, removing dead code
diff --git a/backend/common/rhn_memusage.py b/backend/common/rhn_memusage.py
index a565186..4f4418b 100644
--- a/backend/common/rhn_memusage.py
+++ b/backend/common/rhn_memusage.py
@@ -28,8 +28,3 @@ 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])
commit ee0328bab69c6d4c2eac8c4b86fc0e979dde6860
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 23 14:13:39 2010 +0200
removed dead configuration file
diff --git a/backend/rhn-conf/rhn_server_satexport_internal.conf
b/backend/rhn-conf/rhn_server_satexport_internal.conf
deleted file mode 100644
index 9805602..0000000
--- a/backend/rhn-conf/rhn_server_satexport_internal.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# ** DO NOT EDIT **
-# RHN config for requests traveling through the /SAT-DUMP-INTERNAL receiver
-#
-
-log_file = /var/log/rhn/rhn_sat_export_internal.log
-
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 35ca032..b22604c 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -541,7 +541,6 @@ rm -f %{rhnconf}/rhnSecret.py*
# config files
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-sat-dump-internal.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-iss-export
-%attr(644,root,apache) %{rhnconf}/default/rhn_server_satexport_internal.conf
%files libs
commit e2bf04dcec4a078b1f431f7c54868b992cbee5cb
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Aug 18 10:50:48 2010 +0200
added upgrade script for queue_errata, rhnSNPErrataQueue and rhnSNPServerQueue
removal
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/040-queue_errata-drop.sql
b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/040-queue_errata-drop.sql
new file mode 100644
index 0000000..52ab90c
--- /dev/null
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/040-queue_errata-drop.sql
@@ -0,0 +1 @@
+drop procedure queue_errata;
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/041-rhnSNPErrataQueue-drop.sql
b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/041-rhnSNPErrataQueue-drop.sql
new file mode 100644
index 0000000..52843fc
--- /dev/null
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/041-rhnSNPErrataQueue-drop.sql
@@ -0,0 +1 @@
+drop table rhnSNPErrataQueue;
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/042-rhnSNPServerQueue-drop.sql
b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/042-rhnSNPServerQueue-drop.sql
new file mode 100644
index 0000000..781c283
--- /dev/null
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/042-rhnSNPServerQueue-drop.sql
@@ -0,0 +1 @@
+drop table rhnSNPServerQueue;
commit 2a3a755ed052a0c3435a00d1e6c1c6c9c3ecc470
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Aug 18 10:44:37 2010 +0200
there were only deletes from rhnSNPServerQueue, no inserts/updates; thus removing as a
dead code
diff --git a/schema/spacewalk/common/tables/rhnSNPServerQueue.sql
b/schema/spacewalk/common/tables/rhnSNPServerQueue.sql
deleted file mode 100644
index b5ba23f..0000000
--- a/schema/spacewalk/common/tables/rhnSNPServerQueue.sql
+++ /dev/null
@@ -1,32 +0,0 @@
---
--- Copyright (c) 2008 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
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
---
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
-
-
-CREATE TABLE rhnSNPServerQueue
-(
- server_id NUMBER NOT NULL
- CONSTRAINT rhn_sec_np_sid_fk
- REFERENCES rhnServer (id),
- processed NUMBER
- DEFAULT (0) NOT NULL
-)
-ENABLE ROW MOVEMENT
-;
-
-CREATE INDEX rhn_sec_np_sid_idx
- ON rhnSNPServerQueue (server_id)
- TABLESPACE [[8m_tbs]]
- NOLOGGING;
-
diff --git a/schema/spacewalk/common/tables/tables.deps
b/schema/spacewalk/common/tables/tables.deps
index 078a10e..bdac87c 100644
--- a/schema/spacewalk/common/tables/tables.deps
+++ b/schema/spacewalk/common/tables/tables.deps
@@ -194,7 +194,6 @@ rhnSnapshotConfigRevision :: rhnSnapshot rhnConfigRevision
rhnSnapshotPackage :: rhnSnapshot
rhnSnapshotServerGroup :: rhnServerGroup rhnSnapshot
rhnSnapshotTag :: rhnSnapshot rhnTag
-rhnSNPServerQueue :: rhnServer
rhnSolarisPackage :: rhnPackage
rhnSolarisPatch :: rhnPackage rhnSolarisPatchType
rhnSolarisPatchPackages :: rhnPackage rhnPackageNEVRA
diff --git a/schema/spacewalk/oracle/procs/delete_server.sql
b/schema/spacewalk/oracle/procs/delete_server.sql
index 3d75909..76ad858 100644
--- a/schema/spacewalk/oracle/procs/delete_server.sql
+++ b/schema/spacewalk/oracle/procs/delete_server.sql
@@ -158,7 +158,6 @@ begin
delete from rhnProxyInfo where server_id = server_id_in;
delete from rhnRam where server_id = server_id_in;
delete from rhnRegToken where server_id = server_id_in;
- delete from rhnSNPServerQueue where server_id = server_id_in;
delete from rhnSatelliteChannelFamily where server_id = server_id_in;
delete from rhnSatelliteInfo where server_id = server_id_in;
-- this cascades to rhnActionConfigChannel and rhnActionConfigFileName
diff --git a/schema/spacewalk/oracle/procs/procs.deps
b/schema/spacewalk/oracle/procs/procs.deps
index b1d34c3..c4e44fd 100644
--- a/schema/spacewalk/oracle/procs/procs.deps
+++ b/schema/spacewalk/oracle/procs/procs.deps
@@ -35,7 +35,7 @@ delete_server :: rhn_channel.pks rhn_config.pks \
rhnActionPackageRemovalFailure rhnCpu \
rhnDevice \
rhnProxyInfo rhnRam rhnRegToken \
- rhnSNPServerQueue rhnSatelliteChannelFamily \
+ rhnSatelliteChannelFamily \
rhnSatelliteInfo rhnServerAction \
rhnServerAction rhnServerActionPackageResult \
rhnServerActionScriptResult rhnServerChannel \
diff --git a/schema/spacewalk/postgres/procs/delete_server.sql
b/schema/spacewalk/postgres/procs/delete_server.sql
index c4eeda0..df0bdd8 100644
--- a/schema/spacewalk/postgres/procs/delete_server.sql
+++ b/schema/spacewalk/postgres/procs/delete_server.sql
@@ -159,7 +159,6 @@ begin
delete from rhnProxyInfo where server_id = server_id_in;
delete from rhnRam where server_id = server_id_in;
delete from rhnRegToken where server_id = server_id_in;
- delete from rhnSNPServerQueue where server_id = server_id_in;
delete from rhnSatelliteChannelFamily where server_id = server_id_in;
delete from rhnSatelliteInfo where server_id = server_id_in;
-- this cascades to rhnActionConfigChannel and rhnActionConfigFileName
diff --git a/schema/spacewalk/postgres/procs/procs.deps
b/schema/spacewalk/postgres/procs/procs.deps
index fcbd6e9..9db543c 100644
--- a/schema/spacewalk/postgres/procs/procs.deps
+++ b/schema/spacewalk/postgres/procs/procs.deps
@@ -35,7 +35,7 @@ delete_server :: rhn_channel.pks rhn_config.pks \
rhnActionPackageRemovalFailure rhnCpu \
rhnDevice \
rhnProxyInfo rhnRam rhnRegToken \
- rhnSNPServerQueue rhnSatelliteChannelFamily \
+ rhnSatelliteChannelFamily \
rhnSatelliteInfo rhnServerAction \
rhnServerAction rhnServerActionPackageResult \
rhnServerActionScriptResult rhnServerChannel \
commit 21e92eef62158e04bd708797e020e8abeb8b9918
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Aug 18 10:40:11 2010 +0200
after queue_errata() removal rhnSNPErrataQueue not used anymore
diff --git a/schema/spacewalk/common/tables/rhnSNPErrataQueue.sql
b/schema/spacewalk/common/tables/rhnSNPErrataQueue.sql
deleted file mode 100644
index 830f3aa..0000000
--- a/schema/spacewalk/common/tables/rhnSNPErrataQueue.sql
+++ /dev/null
@@ -1,32 +0,0 @@
---
--- Copyright (c) 2008 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
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
---
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
-
-
-CREATE TABLE rhnSNPErrataQueue
-(
- errata_id NUMBER NOT NULL
- CONSTRAINT rhn_snpErrQueue_eid_fk
- REFERENCES rhnErrata (id)
- ON DELETE CASCADE,
- processed NUMBER
- DEFAULT (0) NOT NULL
-)
-ENABLE ROW MOVEMENT
-;
-
-CREATE UNIQUE INDEX rhn_snpErrQueue_eid_uq
- ON rhnSNPErrataQueue (errata_id)
- TABLESPACE [[64k_tbs]];
-
diff --git a/schema/spacewalk/common/tables/tables.deps
b/schema/spacewalk/common/tables/tables.deps
index f9e6889..078a10e 100644
--- a/schema/spacewalk/common/tables/tables.deps
+++ b/schema/spacewalk/common/tables/tables.deps
@@ -194,7 +194,6 @@ rhnSnapshotConfigRevision :: rhnSnapshot rhnConfigRevision
rhnSnapshotPackage :: rhnSnapshot
rhnSnapshotServerGroup :: rhnServerGroup rhnSnapshot
rhnSnapshotTag :: rhnSnapshot rhnTag
-rhnSNPErrataQueue :: rhnErrata
rhnSNPServerQueue :: rhnServer
rhnSolarisPackage :: rhnPackage
rhnSolarisPatch :: rhnPackage rhnSolarisPatchType
commit 72890387553635cd8726d57dda712bdb1d646eed
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Aug 18 10:37:14 2010 +0200
removing read queue_errata() from deps
diff --git a/schema/spacewalk/oracle/procs/procs.deps
b/schema/spacewalk/oracle/procs/procs.deps
index f52307e..b1d34c3 100644
--- a/schema/spacewalk/oracle/procs/procs.deps
+++ b/schema/spacewalk/oracle/procs/procs.deps
@@ -105,7 +105,6 @@ name_join :: user_group_name_t
new_user_postop :: web_contact rhnUserGroupType rhnUserGroup \
rhnUserGroupMembers
pxt_session_cleanup :: PXTSessions
-queue_errata :: rhnSNPErrataQueue
queue_server :: rhnServerNeededPackageCache rhnTaskQueue \
rhnServerNeededPackageView rhnServer \
rhnServerNeededErrataCache rhnServerNeededView
diff --git a/schema/spacewalk/postgres/procs/procs.deps
b/schema/spacewalk/postgres/procs/procs.deps
index cdb7d68..fcbd6e9 100644
--- a/schema/spacewalk/postgres/procs/procs.deps
+++ b/schema/spacewalk/postgres/procs/procs.deps
@@ -103,7 +103,6 @@ lookup_virt_sub_level :: rhnVirtSubLevel
new_user_postop :: web_contact rhnUserGroupType rhnUserGroup \
rhnUserGroupMembers
pxt_session_cleanup :: PXTSessions
-queue_errata :: rhnSNPErrataQueue
queue_server :: rhnServerNeededPackageCache rhnTaskQueue \
rhnServerNeededPackageView rhnServer \
rhnServerNeededErrataCache rhnServerNeededView
commit 28cd070d23f9c7f63e5dd2eda022c2856eff8528
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Aug 18 10:35:46 2010 +0200
queue_errata() not called anywhere; removing dead procedure
diff --git a/schema/spacewalk/oracle/procs/queue_errata.sql
b/schema/spacewalk/oracle/procs/queue_errata.sql
deleted file mode 100644
index 88a5ad5..0000000
--- a/schema/spacewalk/oracle/procs/queue_errata.sql
+++ /dev/null
@@ -1,39 +0,0 @@
---
--- Copyright (c) 2008 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
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
---
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
---
---
---
-
--- the next two views are basically the same. the first, though, has an outer join to
--- the errata stuff, in case there are packages the server needs that haven't been
--- errata'd (ie, the fringe case)
-
-CREATE OR REPLACE PROCEDURE
-queue_errata(errata_id_in IN NUMBER)
-IS
-BEGIN
- INSERT INTO rhnSNPErrataQueue (errata_id) VALUES (errata_id_in);
-EXCEPTION
- WHEN DUP_VAL_ON_INDEX THEN
- UPDATE rhnSNPErrataQueue SET processed = 0 WHERE errata_id = errata_id_in;
-END;
-/
-SHOW ERRORS
-
---
--- Revision 1.2 2002/05/13 22:53:38 pjones
--- cvs id/log
--- some (note enough) readability fixes
---
diff --git a/schema/spacewalk/postgres/procs/queue_errata.sql
b/schema/spacewalk/postgres/procs/queue_errata.sql
deleted file mode 100644
index 6834205..0000000
--- a/schema/spacewalk/postgres/procs/queue_errata.sql
+++ /dev/null
@@ -1,33 +0,0 @@
--- oracle equivalent source sha1 5dbb1860b79db25997d633002b2bfc47ef469f4e
--- retrieved from
./1235013416/07c0bfbb6902a98d09f8a41896bd55900645af6b/schema/spacewalk/rhnsat/procs/queue_errata.sql
---
--- 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
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
---
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
---
---
---
-
-CREATE OR REPLACE function
-queue_errata(errata_id_in IN numeric)
-returns void
-AS
-$$
-BEGIN
- INSERT INTO rhnSNPErrataQueue (errata_id) VALUES (errata_id_in);
-EXCEPTION
- WHEN UNIQUE_VIOLATION THEN
- UPDATE rhnSNPErrataQueue SET processed = 0 WHERE errata_id = errata_id_in;
-END;
-$$ language plpgsql;
-