client/tools/rhncfg/config_management/rhncfg_add.py | 10 +++++++++-
web/spacewalk-web.spec | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 812793c6c24678e6e362d628ddef225c298f7ead
Author: Marcelo Moreira de Mello <mmello(a)redhat.com>
Date: Wed Apr 27 09:32:24 2011 -0300
699966 - added --ignore-missing option in rhncfg-manager to ignore missing local files
when adding or uploading files
diff --git a/client/tools/rhncfg/config_management/rhncfg_add.py
b/client/tools/rhncfg/config_management/rhncfg_add.py
index 0795691..b88fbc1 100644
--- a/client/tools/rhncfg/config_management/rhncfg_add.py
+++ b/client/tools/rhncfg/config_management/rhncfg_add.py
@@ -44,6 +44,10 @@ class Handler(handler_base.HandlerBase):
'--delim-end', action="store",
help="End delimiter for variable interpolation",
),
+ handler_base.HandlerBase._option_class(
+ '-i', '--ignore-missing',
action="store_true",
+ help="Ignore missing local files",
+ ),
]
def run(self):
@@ -96,7 +100,11 @@ class Handler(handler_base.HandlerBase):
for (local_file, remote_file) in files_to_push:
if not os.path.exists(local_file):
- die(9, "No such file `%s'" % local_file)
+ if self.options.ignore_missing:
+ files_to_push.remove((local_file,remote_file))
+ print "Local file %s does not exist. Ignoring file..."
%(local_file)
+ else:
+ die(9, "No such file `%s'" % local_file)
print "Pushing to channel %s:" % (channel, )
commit 17d96d4a9a24bbe710ba2842aa2a8b1f4e6d7c1f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Apr 27 12:19:38 2011 +0200
remove macro from changelog
addressing:
spacewalk-web.src:299: W: macro-in-%changelog %files
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index aef163a..361bcf4 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -296,7 +296,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Mar 22 2011 Jan Pazdziora 1.4.13-1
- Moving the Requires: httpd from sniglets to base-minimal, dobby, and pxt
- which actually have %files with apache group in them.
+ which actually have %%files with apache group in them.
- No need to require mod_perl explicitly in spacewalk-sniglets, we will get it
via perl(Apache2::Cookie) and perl-libapreq2 from spacewalk-pxt.
- Removing RHEL 4 specific Requires as we no longer support Spacewalk on RHEL 4.
Show replies by date