schema/spacewalk/common/tables/tables.deps | 4 ++--
schema/spacewalk/oracle/procs/procs.deps | 19 ++++---------------
schema/util/genmain.py | 12 +++++++-----
3 files changed, 13 insertions(+), 22 deletions(-)
New commits:
commit 407ee9c39b621dc3e2395475dcd13e2b98d6c099
Author: Jeff Ortel <jortel(a)redhat.com>
Date: Wed Apr 1 15:12:53 2009 -0400
Tweak dep aliasing and fix circular references and dups in .deps
diff --git a/schema/spacewalk/common/tables/tables.deps
b/schema/spacewalk/common/tables/tables.deps
index b3aba1a..6623e18 100644
--- a/schema/spacewalk/common/tables/tables.deps
+++ b/schema/spacewalk/common/tables/tables.deps
@@ -79,11 +79,11 @@ rhnErrataBuglist :: rhnErrata
rhnErrataBuglistTmp :: rhnErrataTmp
rhnErrataCVE :: rhnErrata rhnCVE
rhnErrataCVETmp :: rhnErrataTmp rhnCVE
-rhnErrataFile :: rhnErrata rhnErrataFileType lookup_functions
+rhnErrataFile :: rhnErrata rhnErrataFileType
rhnErrataFileChannel :: rhnChannel rhnErrataFile rhnChannelErrata
rhnErrataFilePackage :: rhnPackage rhnErrataFile rhnErrataPackage
rhnErrataFilePackageSource :: rhnErrataFile rhnPackageSource rhnErrataPackage
-rhnErrataFileTmp :: rhnErrataTmp rhnErrataFileType lookup_functions
+rhnErrataFileTmp :: rhnErrataTmp rhnErrataFileType
rhnErrataFileChannelTmp :: rhnErrataFileTmp rhnChannel
rhnErrataFilePackageTmp :: rhnErrataFileTmp rhnChannel
rhnErrataKeyword :: rhnErrata
diff --git a/schema/spacewalk/oracle/procs/procs.deps
b/schema/spacewalk/oracle/procs/procs.deps
index b1aa6b7..874bbc9 100644
--- a/schema/spacewalk/oracle/procs/procs.deps
+++ b/schema/spacewalk/oracle/procs/procs.deps
@@ -2,7 +2,7 @@
# Dependencies for objects in the procs directory
#
-path = . tables views packages data
+path = . tables views packages class types data
buildPackageSenseMap :: rhnPackageSenseMap
create_first_org :: rhnUserGroupType rhnUserGroup
@@ -52,7 +52,6 @@ entitle_order :: rhn_ep
is_user_applicant :: rhnUserGroupType web_contact rhnUserGroup \
rhnUserGroupMembers
lookup_arch_type :: rhnArchType_data rhn_exception.pks
-lookup_cache_key :: rhnCacheKey rhnCache rhnCacheTimestamps
lookup_channel_arch :: rhn_exception.pks rhnException_data rhnChannelArch \
rhnChannelArch_data
lookup_client_capability :: rhnClientCapabilityName
@@ -70,7 +69,7 @@ lookup_functions :: lookup_evr lookup_package_name \
lookup_source_name lookup_channel_arch \
lookup_server_arch lookup_package_arch \
lookup_package_capability \
- lookup_erratafile_type lookup_cache_key \
+ lookup_erratafile_type \
lookup_snapshot_invalid_reason \
lookup_tag_name lookup_sg_type \
lookup_tag lookup_arch_type
@@ -101,8 +100,8 @@ queue_errata :: rhnSNPErrataQueue
queue_server :: rhnServerNeededPackageCache rhnTaskQueue \
rhnServerNeededPackageView rhnServer \
rhnServerNeededErrataCache rhnServerNeededView
-rhn_cache_delete :: lookup_cache_key rhnCacheTimestamps rhnCache
-rhn_cache_set :: rhnCacheKey rhnCache rhnCacheTimestamps
+rhn_cache_delete :: rhnCacheTimestamps rhnCache
+rhn_cache_set :: rhnCacheKey rhnCache rhnCacheTimestamps
rhn_cache_update_accessed :: rhnCacheKey rhnCache rhnCacheTimestamps
rhn_install_org_satellites :: rhn_command_queue_instances rhn_ll_netsaint \
@@ -118,13 +117,3 @@ rhn_synch_probe_state :: rhn_probe_state rhn_deployed_probe
\
set_ks_session_history_message :: rhnKickstartSessionState \
rhnKickstartSessionHistory
truncateCacheQueue :: rhnOrgErrataCacheQueue
-lookup_functions :: lookup_evr lookup_package_name \
- lookup_package_nevra \
- lookup_source_name lookup_channel_arch \
- lookup_server_arch lookup_package_arch \
- lookup_package_capability \
- lookup_erratafile_type lookup_cache_key \
- lookup_snapshot_invalid_reason \
- lookup_tag_name lookup_sg_type \
- lookup_tag lookup_arch_type
-
diff --git a/schema/util/genmain.py b/schema/util/genmain.py
index 6feda58..8cc8150 100755
--- a/schema/util/genmain.py
+++ b/schema/util/genmain.py
@@ -178,19 +178,21 @@ class DepTab:
return result
def expand(self, keyset, history):
- result = ([], [])
+ result = ([],[])
for key in keyset:
if key in history:
- print 'circular dependency detected:\n%s' % str(history)
+ print 'circular dependency:%s' % history
continue
- history.append(key)
alias = self.aliases.get(key)
if alias is None:
result[0].append(key)
continue
+ history.append(key)
alias.hits += 1
- for ks in alias.expanded(history):
- result[1].append(ks)
+ for deps in alias.expanded(history):
+ result[1].append(deps)
+ if len(result[1]):
+ result = ([], result[1])
return result
def findaliases(self):
Show replies by date