client/rhel/rhn-client-tools/src/up2date_client/rhncli.py | 20 ++++++++++----
1 file changed, 15 insertions(+), 5 deletions(-)
New commits:
commit c47e441b3f7ac318eb060b44e7942b5d79115aaa
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Feb 16 14:48:53 2010 +0100
Update licence text and copyright years in rhncli.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
b/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
index fdc191d..86c9e26 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
@@ -1,6 +1,17 @@
#
-# Common cli related functions for RHN client tools
-# Copyright (c) 1999-2006 Red Hat, Inc. Distributed under GPL.
+# Common cli related functions for RHN Client Tools
+# Copyright (c) 1999--2010 Red Hat, Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+#
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# Red Hat trademarks are not licensed under GPLv2. No permission is
+# granted to use or replicate Red Hat trademarks that are incorporated
+# in this software or its documentation.
#
# Authors:
# Adrian Likins <alikins(a)redhat.com>
@@ -173,8 +184,8 @@ class RhnCli(object):
@staticmethod
def __versionString():
versionString = _("%%prog (Red Hat Network Client Tools) %s\n"
- "Copyright (C) 1999-2006 Red Hat, Inc.\n"
- "Licensed under the terms of the GPL.") % up2dateUtils.version()
+ "Copyright (C) 1999--2010 Red Hat, Inc.\n"
+ "Licensed under the terms of the GPLv2.") % up2dateUtils.version()
return versionString
@staticmethod
commit bddc009707da4c2e2684c72cd5910f894fcded22
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Feb 16 14:48:10 2010 +0100
rpcServer not used in rhncli, removing the import.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
b/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
index 765c940..fdc191d 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
@@ -26,7 +26,6 @@ _ = gettext.gettext
sys.path.append("/usr/share/rhn/")
from up2date_client import config
-from up2date_client import rpcServer
from up2date_client import up2dateAuth
from up2date_client import up2dateErrors
from up2date_client import up2dateLog