client/rhel/rhn-client-tools/etc-conf/Makefile | 4 - client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 + client/rhel/rhn-client-tools/src/actions/up2date_config.py | 44 ------------- rel-eng/packages/rhn-client-tools | 2 4 files changed, 6 insertions(+), 50 deletions(-)
New commits: commit 22b46647fd50dae50418b7d41a3d5833e6c4d588 Author: Milan Zazrivec mzazrivec@redhat.com Date: Fri Feb 14 16:31:13 2014 +0100
Automatic commit of package [rhn-client-tools] release [2.1.16-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index 5758523..5f0215c 100644 --- a/client/rhel/rhn-client-tools/rhn-client-tools.spec +++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec @@ -4,7 +4,7 @@ Group: System Environment/Base Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... URL: https://fedorahosted.org/spacewalk Name: rhn-client-tools -Version: 2.1.15 +Version: 2.1.16 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -360,6 +360,10 @@ make -f Makefile.rhn-client-tools test %endif
%changelog +* Fri Feb 14 2014 Milan Zazrivec mzazrivec@redhat.com 2.1.16-1 +- 1061013 - remove up2date_config.rpmmacros client action +- 1061013 - remove macros.up2date from package build + * Fri Feb 14 2014 Matej Kollar mkollar@redhat.com 2.1.15-1 - 1061013 - remove unneeded rpm macros file - 1060742 - new information icon in gnome3 diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools index a3d6175..14ef5ce 100644 --- a/rel-eng/packages/rhn-client-tools +++ b/rel-eng/packages/rhn-client-tools @@ -1 +1 @@ -2.1.15-1 client/rhel/rhn-client-tools/ +2.1.16-1 client/rhel/rhn-client-tools/
commit 46225ac557ead3dfac019958020861fe740aea66 Author: Milan Zazrivec mzazrivec@redhat.com Date: Fri Feb 14 16:23:52 2014 +0100
1061013 - remove up2date_config.rpmmacros client action
Support for this client-side action has never been implemented on the server.
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 0edd125..44f31dd 100644 --- a/client/rhel/rhn-client-tools/src/actions/up2date_config.py +++ b/client/rhel/rhn-client-tools/src/actions/up2date_config.py @@ -16,7 +16,6 @@ cfg = config.initUp2dateConfig()
__rhnexport__ = [ 'update', - 'rpmmacros', 'get']
argVerbose = 0 @@ -63,49 +62,6 @@ def get(cache_only=None): return (0, "configuration retrived", {'data' : ret})
-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), {}) - - -def writeUp2dateMacro(macroName, macroValue): - - if os.access("/etc/rpm/macros.up2date", os.R_OK): - f = open("/etc/rpm/macros.up2date", "r") - lines = f.readlines() - f.close() - else: - lines = [] - comment_r = re.compile("\s*#.*") - value_r = re.compile("%s.*" % macroName) - blank_r = re.compile("\s*") - newfile = [] - for line in lines: - m = value_r.match(line) - if m: - continue - - m = comment_r.match(line) - if m: - newfile.append(line) - continue - - newfile.append(line) - - # dont care about blank lines... - - newfile.append("\n") - newfile.append("%s %s" % (macroName, macroValue)) - - - f = open("/etc/rpm/macros.up2date", "w") - for line in newfile: - f.write(line) - f.write("\n") - f.close() -
def main(): configdatatup = get()
commit 2c2b59ebbac688791015bfbf0d1b265365d6a8f5 Author: Milan Zazrivec mzazrivec@redhat.com Date: Fri Feb 14 16:20:13 2014 +0100
1061013 - remove macros.up2date from package build
diff --git a/client/rhel/rhn-client-tools/etc-conf/Makefile b/client/rhel/rhn-client-tools/etc-conf/Makefile index 9054968..c418d2a 100644 --- a/client/rhel/rhn-client-tools/etc-conf/Makefile +++ b/client/rhel/rhn-client-tools/etc-conf/Makefile @@ -4,7 +4,6 @@ PREFIX ?=
CONFIG = up2date.config -MACROS_CONFIG = macros.up2date
# Directories for installation PAMD_DIR = $(PREFIX)/etc/pam.d @@ -41,9 +40,6 @@ install:: all $(DIRS) [ -f $(CONFIG_DIR)/up2date ] && true || \ $(INSTALL_DATA) $(CONFIG) $(CONFIG_DIR)/up2date
- [ -f $(MACROS_DIR)/macros.up2date ] && true || \ - $(INSTALL_DATA) $(MACROS_CONFIG) $(MACROS_DIR)/macros.up2date - $(INSTALL_DATA) up2date.logrotate $(LOGROTATE_DIR)/up2date
clean::
spacewalk-commits@lists.fedorahosted.org