client/tools/rhnpush/rhnpush.py | 4 +---
client/tools/rhnpush/rhnpush.sgml | 9 ---------
client/tools/rhnpush/rhnpush_config.py | 1 -
client/tools/rhnpush/rhnpushrc | 3 ---
client/tools/rhnpush/uploadLib.py | 2 +-
proxy/proxy/pm/rhn_package_manager.py | 1 -
proxy/proxy/pm/rhn_package_manager.sgml | 6 ------
7 files changed, 2 insertions(+), 24 deletions(-)
New commits:
commit 8c1bcd725e934a36a74f192b910518e8ced07742
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jul 13 14:33:17 2012 +0200
fixed man page
diff --git a/client/tools/rhnpush/rhnpush.sgml b/client/tools/rhnpush/rhnpush.sgml
index 59602e0..6a69bc0 100644
--- a/client/tools/rhnpush/rhnpush.sgml
+++ b/client/tools/rhnpush/rhnpush.sgml
@@ -90,9 +90,6 @@ Utility to push binary and source RPMs into an RHN channel.
<arg>-N</arg> <arg>--new-cache</arg>
</cmdsynopsis>
<cmdsynopsis>
- <arg>--no-cache</arg>
- </cmdsynopsis>
- <cmdsynopsis>
<arg>--no-session-caching</arg>
</cmdsynopsis>
<cmdsynopsis>
@@ -283,12 +280,6 @@ Utility to push binary and source RPMs into an RHN channel.
<para>create a new username/password cache</para>
</listitem>
</varlistentry>
- <varlistentry>
- <term>--no-cache</term>
- <listitem>
- <para>Do not create username/password cache</para>
- </listitem>
- </varlistentry>
<varlistentry>
<term>--no-session-caching</term>
<listitem>
diff --git a/proxy/proxy/pm/rhn_package_manager.sgml
b/proxy/proxy/pm/rhn_package_manager.sgml
index 1e904ee..a7fe175 100644
--- a/proxy/proxy/pm/rhn_package_manager.sgml
+++ b/proxy/proxy/pm/rhn_package_manager.sgml
@@ -169,12 +169,6 @@ Manages RPM packages for the RHN proxy
</listitem>
</varlistentry>
<varlistentry>
- <term>--no-cache</term>
- <listitem>
- <para>Do not create username/password cache</para>
- </listitem>
- </varlistentry>
- <varlistentry>
<term>--no-session-caching</term>
<listitem>
<para>This option disabled session token authentication. Useful if you
want to push to two or more different servers.</para>
commit 86a98a75634ee585d17f8d2fe9db252f4cf038ff
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jul 13 14:31:09 2012 +0200
removed dead --no-cache option
this option is dead since we started to use session authentication
diff --git a/proxy/proxy/pm/rhn_package_manager.py
b/proxy/proxy/pm/rhn_package_manager.py
index b394b1f..86abeda 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -71,7 +71,6 @@ def main():
Option( '--copyonly', action='store_true', help="Only
copy packages; don't reimport"),
Option( '--test', action='store_true', help='Only
print the packages to be pushed'),
Option('-N','--new-cache', action='store_true',
help='Create a new username/password cache'),
- Option( '--no-cache', action='store_true', help='Do not
create a username/password cache'),
Option( '--no-ssl', action='store_true', help='Turn
off SSL (not recommended).'),
Option( '--no-session-caching', action='store_true',
help='Disables session-token authentication.'),
commit 4435de0e59ffc6e50f1a9e48688c2f21d6c22e8b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jul 13 14:15:08 2012 +0200
removed dead --no-cache option
this option is dead since we started to use session authentication
diff --git a/client/tools/rhnpush/rhnpush.py b/client/tools/rhnpush/rhnpush.py
index 5f94fe4..815eb19 100755
--- a/client/tools/rhnpush/rhnpush.py
+++ b/client/tools/rhnpush/rhnpush.py
@@ -76,7 +76,6 @@ def main():
Option( '--test', action='store_true', help='Only
print the packages to be pushed'),
Option('-?','--usage', action='store_true',
help='Briefly describe the options'),
Option('-N','--new-cache', action='store_true',
help='Create a new username/password cache'),
- Option( '--no-cache', action='store_true', help='Do not
create a username/password cache'),
Option( '--extended-test', action='store_true',
help='Perform a more verbose test'),
Option( '--no-session-caching', action='store_true',
help='Disables session-token authentication.'),
@@ -85,9 +84,8 @@ def main():
]
#Having to maintain a store_true list is ugly. I'm trying to get rid of this.
- #12/22/05 wregglej 173287 Added no_cache to true_list so it's value gets
changed from a string to an int.
true_list = ['usage', 'test', 'source', 'header',
'nullorg', 'newest',\
- 'nosig', 'force', 'list', 'stdin',
'new_cache','extended_test', 'no_cache',\
+ 'nosig', 'force', 'list', 'stdin',
'new_cache','extended_test', \
'no_session_caching', 'tolerant']
optionParser = OptionParser(option_list=optionsTable, usage="%prog [OPTION]
[<package>]")
manager = rhnpush_confmanager.ConfManager(optionParser, true_list)
diff --git a/client/tools/rhnpush/rhnpush_config.py
b/client/tools/rhnpush/rhnpush_config.py
index 3562115..8f4e75b 100644
--- a/client/tools/rhnpush/rhnpush_config.py
+++ b/client/tools/rhnpush/rhnpush_config.py
@@ -54,7 +54,6 @@ class rhnpushConfigParser:
'channel' : '',
'cache_lifetime' : '600',
'new_cache' : '0',
- 'no_cache' : '0',
'extended_test' : '0',
'no_session_caching' : '0',
'proxy' : '',
diff --git a/client/tools/rhnpush/rhnpushrc b/client/tools/rhnpush/rhnpushrc
index 625a04f..30de125 100644
--- a/client/tools/rhnpush/rhnpushrc
+++ b/client/tools/rhnpush/rhnpushrc
@@ -64,9 +64,6 @@ cache_lifetime = 600
#Reset the cache
new_cache = 0
-#Disable user/pass caching.
-no_cache = 0
-
#Run the extended version of the test
extended_test = 0
commit ee1ac53ccef616aa27ebd456f06c5ce5379b3571
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jul 13 14:18:41 2012 +0200
fixed --no-session-caching option
diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploadLib.py
index 3c7bb32..04b4e3b 100644
--- a/client/tools/rhnpush/uploadLib.py
+++ b/client/tools/rhnpush/uploadLib.py
@@ -424,7 +424,7 @@ class UploadClass:
self.session = rhnpush_cache.RHNPushSession()
self.session.setSessionString(session)
- if not self.options.no_cache:
+ if not self.options.no_session_caching:
self.session.writeSession()
def authenticate(self):