client/rhel/rhn-client-tools/man/en/spacewalk-channel.8 | 22 ++++++++------
client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py | 7 +++-
rel-eng/build-missing-builds-in-koji.sh | 2 -
3 files changed, 20 insertions(+), 11 deletions(-)
New commits:
commit ccd4f51aab40d49b22ba75d0d19010c95cb62406
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Dec 3 14:06:28 2009 +0100
nightly is now build to 0.8-candidate tags
diff --git a/rel-eng/build-missing-builds-in-koji.sh
b/rel-eng/build-missing-builds-in-koji.sh
index da85a92..eb8efb8 100755
--- a/rel-eng/build-missing-builds-in-koji.sh
+++ b/rel-eng/build-missing-builds-in-koji.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-TAGS=([0]="dist-5E-sw-0.7-candidate" [1]="dist-f11-sw-0.7-candidate"
[2]="dist-f12-sw-0.7-candidate")
+TAGS=([0]="dist-5E-sw-0.8-candidate" [1]="dist-f11-sw-0.8-candidate"
[2]="dist-f12-sw-0.8-candidate")
pushd `pwd`
commit aed727e46acf0c7b70919c656c96f824eb659ed2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Dec 3 13:19:09 2009 +0100
216808 - if username and password is not given on command line, script will prompt for
it
diff --git a/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
b/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
index 427e062..c7b40cb 100644
--- a/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
+++ b/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
@@ -42,10 +42,12 @@ You are unsubscribing system to given channel(s). You have to specify
--user and
.br
.IP "\fB-u, --username\fP"
Your username used to register the system with and for Red Hat Network, RHN Satellite or
Spacewalk.
+If you do not enter this option and it is required, you will be prompted.
.br
.IP "\fB-p, --password\fP"
The password associated with the username specified with the \fB--username\fR
option. This is an unencrypted password.
+If you do not enter this option and it is required, you will be prompted.
.br
.IP "\fB-c, --channel\fP"
Label of channel you want to subscribe to or unsubscribe from. Can be specified multiple
diff --git a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
index da1d082..968dd29 100644
--- a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
+++ b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
@@ -16,6 +16,8 @@
import os
import socket
import sys
+import getpass
+
from optparse import Option, OptionParser
def systemExit(code, msgs=None):
@@ -65,9 +67,10 @@ def processCommandline():
if args:
systemExit(1, "ERROR: these arguments make no sense in this context (try
--help)")
if not OPTIONS.user and not OPTIONS.list:
- systemExit(2, "ERROR: username is required")
+ print("Username: ")
+ OPTIONS.user = sys.stdin.readline()
if not OPTIONS.password and not OPTIONS.list:
- systemExit(3, "ERROR: password is required")
+ OPTIONS.password = getpass.getpass()
def main():
if OPTIONS.add:
commit 16c641efcc1ef5d4d9e5dc408653134e14df818b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Dec 3 12:16:24 2009 +0100
216808 - polish man page
diff --git a/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
b/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
index 668c3d6..427e062 100644
--- a/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
+++ b/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
@@ -25,23 +25,23 @@ spacewalk-channel [\fIoptions\fP]
.SH DESCRIPTION
.PP
-\fVspacewalk-channel\fR enable you to subscribe to and unsubscribe from
-specified channels via the command line so a visit to the Red Hat Network
+\fVspacewalk-channel\fR allows you to subscribe to and unsubscribe from
+specified channels via the command line. A visit to the Red Hat Network
(or Spacewalk) website isn't required.
.SH OPTIONS
.IP "\fB-l, --list\fP"
-Print list of channel you are currently subscribed to.
+Print a list of channel(s) that you are currently subscribed to.
.br
.IP "\fB-a, --add\fP"
-You are subscribing system to given channel. You have to specify --user and --password.
+You are subscribing system to given channel(s). You have to specify --user and
--password.
.br
.IP "\fB-r, --remove\fP"
-You are unsubscribing system to given channel. You have to specify --user and
--password.
+You are unsubscribing system to given channel(s). You have to specify --user and
--password.
.br
.IP "\fB-u, --username\fP"
-The username to register the system with under Red Hat Network, RHN Satellite or
Spacewalk.
+Your username used to register the system with and for Red Hat Network, RHN Satellite or
Spacewalk.
.br
.IP "\fB-p, --password\fP"
The password associated with the username specified with the \fB--username\fR
@@ -57,13 +57,17 @@ Print out successfull action.
.IP "\fB-h, --help\fP"
Show a help message and exit.
+.SH NOTE
+.PP
+The addition and removal of channels is mutually exclusive, please use the command
twice.
+
.SH "EXAMPLES"
Subscribe to two channels:
.RS
.nf
-spacewalk-channel --add -c rhn-tools-rhel-i386-server-5 -c rhel-i386-server-vt-5 --user
user --password foobar
+spacewalk-channel --add -c rhn-tools-rhel-i386-server-5 -c rhel-i386-server-vt-5 --user
username --password password
.fi
.RE
@@ -71,7 +75,7 @@ Unsubscribe from channel:
.RS
.nf
-spacewalk-channel --remove -c rhn-tools-rhel-i386-server-5 -c rhel-i386-server-vt-5
--user user --password foobar
+spacewalk-channel --remove -c rhn-tools-rhel-i386-server-5 -c rhel-i386-server-vt-5
--user username --password password
.fi
.RE
Show replies by date