backend/satellite_tools/satCerts.py | 4 +++- backend/satellite_tools/satsync.py | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-)
New commits: commit 720c36c1e35276569be57b91837681baac1f95b4 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Feb 2 11:22:38 2012 +0100
Call the test entitlement count check for satellite-sync as well.
diff --git a/backend/satellite_tools/satCerts.py b/backend/satellite_tools/satCerts.py index da88854..986d32d 100644 --- a/backend/satellite_tools/satCerts.py +++ b/backend/satellite_tools/satCerts.py @@ -168,7 +168,7 @@ group by org, label """)
-def set_slots_from_cert(cert): +def set_slots_from_cert(cert, testonly=False): """ populates database with entitlements from an RHN certificate "cert" is a satellite_cert.SatelliteCert() object NOTE: should only be called by storeRhnCert() @@ -328,6 +328,8 @@ def set_slots_from_cert(cert): sys.stderr.write("Activation failed, will now exit with no changes.\n") sys.exit(1)
+ if testonly: + return
activate_system_entitlement = rhnSQL.Procedure( diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py index 488d23e..412ff9f 100644 --- a/backend/satellite_tools/satsync.py +++ b/backend/satellite_tools/satsync.py @@ -563,6 +563,9 @@ Unable to import certificate: channel dump generation %s incompatible with cert generation %s. Please contact your RHN representative""") % (generation, sat_cert.generation))
+ + satCerts.set_slots_from_cert(sat_cert, testonly=True) + # push it into the database log2(1, 4, _(" - syncing to local database"))
spacewalk-commits@lists.fedorahosted.org