backend/satellite_tools/reposync.py | 9 +++++++--
java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java | 7 ++-----
2 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit f24d6ddd7c2cef9f7b8f9e2da9dcefd6b82df941
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Aug 25 10:54:41 2009 -0400
adding --quiet flag to spacewalk-repo-sync
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 93e18e1..ecdf097 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -35,6 +35,7 @@ class RepoSync:
channel = None
fail = False
repo_label = None
+ quiet = False
def main(self):
initCFG('server')
@@ -79,6 +80,7 @@ class RepoSync:
self.channel_label = options.channel_label
self.fail = options.fail
self.repo_label = options.label
+ self.quiet = options.quiet
self.channel = self.load_channel()
if not self.channel or not
rhnChannel.isCustomChannel(self.channel['id']):
@@ -96,6 +98,7 @@ class RepoSync:
self.parser.add_option('-t', '--type', action='store',
dest='type', help='The type of repo, currently only "yum" is
supported')
self.parser.add_option('-l', '--label', action='store',
dest='label', help='A friendly label to refer to the repo')
self.parser.add_option('-f', '--fail',
action='store_true', dest='fail', default=False , help="If a package
import fails, fail the entire operation")
+ self.parser.add_option('-q', '--quiet',
action='store_true', dest='quiet', default=False, help="Print no
output, still logs output")
return self.parser.parse_args()
def load_plugin(self):
@@ -210,12 +213,14 @@ class RepoSync:
def print_msg(self, message):
rhnLog.log_clean(0, message)
- print message
+ if not self.quiet:
+ print message
def error_msg(self, message):
rhnLog.log_clean(0, message)
- sys.stderr.write(str(message) + "\n")
+ if not self.quiet:
+ sys.stderr.write(str(message) + "\n")
def log_msg(self, message):
rhnLog.log_clean(0, message)
commit 2ac1f2d94b9234791dec6c0d84e7130b26d43321
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Aug 24 16:14:05 2009 -0400
making RepoSyncTask use the --quiet flag for repo syncing
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
index 4d32ff8..d34d805 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
@@ -83,8 +83,8 @@ public class RepoSyncTask implements Job {
src.setLastSynced(new Date());
int chr = p.getInputStream().read();
while (chr != -1) {
- Thread.sleep(10000);
chr = p.getInputStream().read();
+
}
}
@@ -92,10 +92,6 @@ public class RepoSyncTask implements Job {
log.fatal(e.getMessage());
e.printStackTrace();
}
- catch (InterruptedException e) {
- log.fatal(e.getMessage());
- e.printStackTrace();
- }
TaskFactory.removeTask(task);
}
}
@@ -112,6 +108,7 @@ public class RepoSyncTask implements Job {
cmd.add(src.getType().getLabel());
cmd.add("--label");
cmd.add(src.getLabel());
+ cmd.add("--quiet");
return cmd;
}
Show replies by date