client/rhel/rhn-client-tools/src/actions/up2date_config.py | 12 +++++++++---
client/tools/rhncfg/config_common/transactions.py | 8 ++++----
client/tools/rhncfg/rhncfg.spec | 2 ++
3 files changed, 15 insertions(+), 7 deletions(-)
New commits:
commit dc2a2027bbb14b1966fed1f6de21c15d0e68279d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 21 11:39:56 2010 +0200
code style - expand tabs to space
diff --git a/client/tools/rhncfg/config_common/transactions.py
b/client/tools/rhncfg/config_common/transactions.py
index ca5a3f0..cc1ca01 100644
--- a/client/tools/rhncfg/config_common/transactions.py
+++ b/client/tools/rhncfg/config_common/transactions.py
@@ -256,10 +256,10 @@ class DeployTransaction:
log_debug(3, "deploying transaction")
- # 0. handle any dirs we need to create first
- # a) if the dir exists, then just change the mode and owners,
- # else create it and then make sure the mode and owners are correct.
- # b) if there are files, then continue
+ # 0. handle any dirs we need to create first
+ # a) if the dir exists, then just change the mode and owners,
+ # else create it and then make sure the mode and owners are correct.
+ # b) if there are files, then continue
# 1. write new version (tmp)
# a) if anything breaks, remove all tmp versions and error out
# 2. rename old version to backup
commit d1c3f21962e313b12e5383093005216a2963e415
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 21 11:33:22 2010 +0200
let declare that we own directory where rhncfg put backup files
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 2f13864..f7e255c 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -65,6 +65,7 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/%{rhnroot}
make -f Makefile.rhncfg install PREFIX=$RPM_BUILD_ROOT ROOT=%{rhnroot} \
MANDIR=%{_mandir}
+mkdir -p $RPM_BUILD_ROOT/%{_sharedstatedir}/rhncfg/backups
%clean
rm -rf $RPM_BUILD_ROOT
@@ -72,6 +73,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{rhnroot}/config_common
+%{_sharedstatedir}/rhncfg/backups
%doc LICENSE PYTHON-LICENSES.txt
%files client
commit dedf547a0c39fba13f379e64b43d9bafe28a4385
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 21 11:12:35 2010 +0200
add parameter cache_only to up2date_config.* actions
diff --git a/client/rhel/rhn-client-tools/src/actions/up2date_config.py
b/client/rhel/rhn-client-tools/src/actions/up2date_config.py
index d9b60fa..6acdb3a 100644
--- a/client/rhel/rhn-client-tools/src/actions/up2date_config.py
+++ b/client/rhel/rhn-client-tools/src/actions/up2date_config.py
@@ -20,8 +20,10 @@ __rhnexport__ = [
'get']
argVerbose = 0
-def update(configdict):
+def update(configdict, cache_only=None):
"""Invoke this to change the ondisk configuration of
up2date"""
+ if cache_only:
+ return (0, "no-ops for caching", {})
if argVerbose > 1:
print "called update_up2date_config"
@@ -48,8 +50,10 @@ def update(configdict):
return (0, "config updated", {})
-def get():
+def get(cache_only=None):
"""Reterieve the current configuration of up2date"""
+ if cache_only:
+ return (0, "no-ops for caching", {})
if argVerbose > 1:
print "called get_up2date_config"
@@ -59,7 +63,9 @@ def get():
return (0, "configuration retrived", {'data' : ret})
-def rpmmacros(macroName, macroValue):
+def rpmmacros(macroName, macroValue, cache_only):
+ if cache_only:
+ return (0, "no-ops for caching", {})
writeUp2dateMacro(macroName, macroValue)
return (0, "%s set to %s" % (macroName, macroValue), {})
Show replies by date