[prev in list] [next in list] [prev in thread] [next in thread]
List: spacewalk-commits
Subject: 2 commits - client/debian client/rhel client/solaris client/tools java/scripts proxy/installer proxy
From: Michael Mraka <mmraka () fedoraproject ! org>
Date: 2013-09-30 14:13:03
Message-ID: 20130930141303.62CF061041 () fedorahosted ! org
[Download RAW message or body]
client/debian/packages-already-in-debian/apt-transport-spacewalk/packages.py \
| 8 client/debian/packages-already-in-debian/python-ethtool/pethtool.py \
| 4 client/debian/packages-already-in-debian/rhn-client-tools/src/actions/reboot.py \
| 4 client/debian/packages-already-in-debian/rhn-client-tools/src/actions/rhnsd.py \
| 2 client/debian/packages-already-in-debian/rhn-client-tools/src/actions/systemid.py \
| 2 client/debian/packages-already-in-debian/rhn-client-tools/src/actions/up2date_config.py \
| 6 client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn-profile-sync.py \
| 8 client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn_check.py \
| 28 client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn_register.py \
| 12 client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhnreg_ks.py \
| 22 client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py \
| 8 client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py \
| 4 client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py \
| 14 client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py \
| 20 client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py \
| 8 client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_register_firstboot_gui_window.py \
| 16 client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py \
| 14 client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py \
| 6 client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py \
| 2 client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py \
| 2 client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/rhn_start_gui.py \
| 2 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/capabilities.py \
| 20 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/clientCaps.py \
| 4 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/config.py \
| 22 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/debUtils.py \
| 6 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/getMethod.py \
| 8 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/haltree.py \
| 22 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/hardware.py \
| 74 +- client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/messageWindow.py \
| 12 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/progress.py \
| 10 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnChannel.py \
| 6 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnHardware.py \
| 2 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhncli.py \
| 8 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnreg.py \
| 128 +-- client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnregGui.py \
| 326 +++++----- client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnreg_constants.py \
| 18 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnserver.py \
| 8 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpcServer.py \
| 30 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpmUtils.py \
| 48 - client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/transaction.py \
| 6 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/tui.py \
| 146 ++-- client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateAuth.py \
| 20 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateErrors.py \
| 18 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateLog.py \
| 12 client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/yumPlugin.py \
| 4 client/debian/packages-already-in-debian/rhn-client-tools/test/haltreetests.py \
| 12 client/debian/packages-already-in-debian/rhn-client-tools/test/testByteRangeRpcServer.py \
| 2 client/debian/packages-already-in-debian/rhn-client-tools/test/testClientCaps.py \
| 6 client/debian/packages-already-in-debian/rhn-client-tools/test/testConfig.py \
| 8 client/debian/packages-already-in-debian/rhn-client-tools/test/testRhnChannel.py \
| 4 client/debian/packages-already-in-debian/rhn-client-tools/test/testRpcServer.py \
| 44 - client/debian/packages-already-in-debian/rhn-client-tools/test/testRpmUtils.py \
| 4 client/debian/packages-already-in-debian/rhn-client-tools/test/testSSLSocketTimeout.py \
| 6 client/debian/packages-already-in-debian/rhn-client-tools/test/testTransactions.py \
| 26 client/debian/packages-already-in-debian/rhn-client-tools/test/testUp2dateAuth.py \
| 18 client/debian/packages-already-in-debian/rhn-client-tools/test/testrhnregGui.py \
| 18 client/debian/packages-already-in-debian/rhn-client-tools/test/testutils.py \
| 28 client/debian/packages-already-in-debian/rhnlib/rhn/SSL.py \
| 18 client/debian/packages-already-in-debian/rhnlib/rhn/SmartIO.py \
| 2 client/debian/packages-already-in-debian/rhnlib/rhn/UserDictCase.py \
| 6 client/debian/packages-already-in-debian/rhnlib/rhn/__init__.py \
| 2 client/debian/packages-already-in-debian/rhnlib/rhn/connections.py \
| 14 client/debian/packages-already-in-debian/rhnlib/rhn/nonblocking.py \
| 4 client/debian/packages-already-in-debian/rhnlib/rhn/rpclib.py \
| 48 - client/debian/packages-already-in-debian/rhnlib/rhn/transports.py \
| 84 +- client/debian/packages-already-in-debian/rhnlib/test/00-connection.py \
| 4 client/debian/packages-already-in-debian/rhnlib/test/02-callbacks.py \
| 4 client/debian/packages-already-in-debian/rhnlib/test/03-nonblocking.py \
| 2 client/debian/packages-already-in-debian/rhnlib/test/04-authenticated-proxy.py \
| 6 client/debian/packages-already-in-debian/rhnlib/test/05-delete-packages.py \
| 2 client/debian/packages-already-in-debian/rhnlib/test/07-leaking-ssl-fd.py \
| 2 client/debian/packages-already-in-debian/rhnlib/test/10-tempfile.py \
| 2 client/debian/packages-already-in-debian/rhnlib/test/12-Input-Output.py \
| 2 client/debian/packages-already-in-debian/rhnlib/test/13-safe_read.py \
| 4 client/debian/packages-already-in-debian/rhnlib/test/14-Input-Output.py \
| 4 client/debian/packages-already-in-debian/rhnlib/test/15-ranges.py \
| 2 client/debian/packages-already-in-debian/rhnlib/test/16-test-ranges.py \
| 2 client/debian/packages-already-in-debian/rhnlib/test/19-redirects.py \
| 4 client/debian/packages-already-in-debian/rhnlib/test/20-proxy-user-agent.py \
| 2 client/debian/packages-already-in-debian/rhnlib/test/23-digest-auth.py \
| 6 client/debian/packages-already-in-debian/rhnlib/test/24-ssl-memleak.py \
| 4 client/debian/packages-already-in-debian/rhnlib/test/25-ssl-memleak.py \
| 2 client/debian/packages-already-in-debian/rhnlib/test/26-ssl-bad-cert.py \
| 2 client/debian/packages-already-in-debian/rhnlib/test/__init__.py \
| 4 client/rhel/rhn-client-tools/src/actions/reboot.py \
| 4 client/rhel/rhn-client-tools/src/actions/rhnsd.py \
| 2 client/rhel/rhn-client-tools/src/actions/systemid.py \
| 2 client/rhel/rhn-client-tools/src/actions/up2date_config.py \
| 6 client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py \
| 8 client/rhel/rhn-client-tools/src/bin/rhn_check.py \
| 28 client/rhel/rhn-client-tools/src/bin/rhn_register.py \
| 12 client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py \
| 22 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py \
| 8 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py \
| 4 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py \
| 14 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py \
| 20 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py \
| 8 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_register_firstboot_gui_window.py \
| 16 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py \
| 14 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py \
| 6 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_create_profile_gui.py \
| 2 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_provide_certificate_gui.py \
| 2 client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_start_gui.py \
| 2 client/rhel/rhn-client-tools/src/up2date_client/capabilities.py \
| 20 client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py \
| 4 client/rhel/rhn-client-tools/src/up2date_client/debUtils.py \
| 6 client/rhel/rhn-client-tools/src/up2date_client/getMethod.py \
| 8 client/rhel/rhn-client-tools/src/up2date_client/haltree.py \
| 22 client/rhel/rhn-client-tools/src/up2date_client/hardware.py \
| 70 +- client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py \
| 12 client/rhel/rhn-client-tools/src/up2date_client/rhnChannel.py \
| 6 client/rhel/rhn-client-tools/src/up2date_client/rhnHardware.py \
| 2 client/rhel/rhn-client-tools/src/up2date_client/rhncli.py \
| 8 client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py \
| 30 client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py \
| 48 - client/rhel/rhn-client-tools/src/up2date_client/transaction.py \
| 6 client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py \
| 20 client/rhel/rhn-client-tools/src/up2date_client/up2dateLog.py \
| 12 client/rhel/rhn-client-tools/src/up2date_client/yumPlugin.py \
| 4 client/rhel/rhn-client-tools/test/haltreetests.py \
| 12 client/rhel/rhn-client-tools/test/testByteRangeRpcServer.py \
| 2 client/rhel/rhn-client-tools/test/testClientCaps.py \
| 6 client/rhel/rhn-client-tools/test/testConfig.py \
| 8 client/rhel/rhn-client-tools/test/testRhnChannel.py \
| 4 client/rhel/rhn-client-tools/test/testRpcServer.py \
| 44 - client/rhel/rhn-client-tools/test/testRpmUtils.py \
| 4 client/rhel/rhn-client-tools/test/testSSLSocketTimeout.py \
| 6 client/rhel/rhn-client-tools/test/testTransactions.py \
| 26 client/rhel/rhn-client-tools/test/testUp2dateAuth.py \
| 18 client/rhel/rhn-client-tools/test/testrhnregGui.py \
| 18 client/rhel/rhn-client-tools/test/testutils.py \
| 28 client/rhel/rhnlib/rhn/SSL.py \
| 18 client/rhel/rhnlib/rhn/SmartIO.py \
| 2 client/rhel/rhnlib/rhn/UserDictCase.py \
| 6 client/rhel/rhnlib/rhn/__init__.py \
| 2 client/rhel/rhnlib/rhn/connections.py \
| 14 client/rhel/rhnlib/rhn/nonblocking.py \
| 4 client/rhel/rhnlib/rhn/rpclib.py \
| 48 - client/rhel/rhnlib/rhn/transports.py \
| 88 +- client/rhel/rhnlib/test/00-connection.py \
| 4 client/rhel/rhnlib/test/02-callbacks.py \
| 4 client/rhel/rhnlib/test/03-nonblocking.py \
| 2 client/rhel/rhnlib/test/04-authenticated-proxy.py \
| 6 client/rhel/rhnlib/test/05-delete-packages.py \
| 2 client/rhel/rhnlib/test/07-leaking-ssl-fd.py \
| 2 client/rhel/rhnlib/test/10-tempfile.py \
| 2 client/rhel/rhnlib/test/12-Input-Output.py \
| 2 client/rhel/rhnlib/test/13-safe_read.py \
| 4 client/rhel/rhnlib/test/14-Input-Output.py \
| 4 client/rhel/rhnlib/test/15-ranges.py \
| 2 client/rhel/rhnlib/test/16-test-ranges.py \
| 2 client/rhel/rhnlib/test/19-redirects.py \
| 4 client/rhel/rhnlib/test/20-proxy-user-agent.py \
| 2 client/rhel/rhnlib/test/23-digest-auth.py \
| 6 client/rhel/rhnlib/test/24-ssl-memleak.py \
| 4 client/rhel/rhnlib/test/25-ssl-memleak.py \
| 2 client/rhel/rhnlib/test/26-ssl-bad-cert.py \
| 2 client/rhel/rhnlib/test/__init__.py \
| 4 client/rhel/yum-rhn-plugin/actions/packages.py \
| 68 +- client/rhel/yum-rhn-plugin/rhnplugin.py \
| 30 client/rhel/yum-rhn-plugin/test/gpgkeyurltests.py \
| 4 client/rhel/yum-rhn-plugin/test/profilesynctests.py \
| 22 client/rhel/yum-rhn-plugin/test/proxyconfigtests.py \
| 4 client/rhel/yum-rhn-plugin/test/sslcacertconfigtests.py \
| 12 client/solaris/rhnclient/rhn/actions/__init__.py \
| 6 client/solaris/rhnclient/rhn/actions/rhnsd.py \
| 2 client/solaris/rhnclient/rhn/actions/systemid.py \
| 2 client/solaris/rhnclient/rhn/actions/up2date_config.py \
| 2 client/solaris/rhnclient/rhn/client/capabilities.py \
| 6 client/solaris/rhnclient/rhn/client/clientCaps.py \
| 4 client/solaris/rhnclient/rhn/client/config.py \
| 22 client/solaris/rhnclient/rhn/client/hardware.py \
| 20 client/solaris/rhnclient/rhn/client/rhnAuth.py \
| 14 client/solaris/rhnclient/rhn/client/rhnErrors.py \
| 20 client/solaris/rhnclient/rhn/client/rhnHardware.py \
| 2 client/solaris/rhnclient/rhn/client/rhnLog.py \
| 6 client/solaris/rhnclient/rhn/client/rhnPackages.py \
| 4 client/solaris/rhnclient/rhn/client/rhnReg.py \
| 22 client/solaris/rhnclient/rhn/client/rhnUtils.py \
| 20 client/solaris/rhnclient/rhn/client/rpcServer.py \
| 30 client/solaris/rhnclient/rhn/client/translate.py \
| 2 client/solaris/rhnclient/rhn_check.py \
| 36 - client/solaris/rhnclient/rhnreg_ks.py \
| 38 - client/solaris/smartpm/sandbox/cdproblems.py \
| 2 client/solaris/smartpm/sandbox/fileconflicts.py \
| 4 client/solaris/smartpm/sandbox/notobsoleting.py \
| 2 client/solaris/smartpm/sandbox/qtprogress.py \
| 2 client/solaris/smartpm/setup.py \
| 2 client/solaris/smartpm/smart/backends/deb/base.py \
| 2 client/solaris/smartpm/smart/backends/deb/loader.py \
| 2 client/solaris/smartpm/smart/backends/rpm/header.py \
| 20 client/solaris/smartpm/smart/backends/rpm/metadata.py \
| 2 client/solaris/smartpm/smart/backends/rpm/pm.py \
| 4 client/solaris/smartpm/smart/backends/rpm/redcarpet.py \
| 4 client/solaris/smartpm/smart/backends/rpm/synthesis.py \
| 6 client/solaris/smartpm/smart/backends/slack/loader.py \
| 6 client/solaris/smartpm/smart/backends/solaris/base.py \
| 2 client/solaris/smartpm/smart/backends/solaris/loader.py \
| 28 client/solaris/smartpm/smart/backends/solaris/pm.py \
| 2 client/solaris/smartpm/smart/cache.py \
| 2 client/solaris/smartpm/smart/channels/apt_deb.py \
| 2 client/solaris/smartpm/smart/channels/rpm_md.py \
client/solaris/smartpm/smart/channels/solaris_rhn.py \
| 8 client/solaris/smartpm/smart/channels/urpmi.py \
| 2 client/solaris/smartpm/smart/commands/channel.py \
| 4 client/solaris/smartpm/smart/commands/query.py \
| 4 client/solaris/smartpm/smart/commands/stats.py \
| 2 client/solaris/smartpm/smart/control.py \
| 8 client/solaris/smartpm/smart/fetcher.py \
| 10 client/solaris/smartpm/smart/hook.py \
| 6 client/solaris/smartpm/smart/interfaces/gtk/__init__.py \
| 2 client/solaris/smartpm/smart/interfaces/gtk/changes.py \
| 2 client/solaris/smartpm/smart/interfaces/gtk/channels.py \
| 14 client/solaris/smartpm/smart/interfaces/gtk/command.py \
| 2 client/solaris/smartpm/smart/interfaces/gtk/flags.py \
| 6 client/solaris/smartpm/smart/interfaces/gtk/interactive.py \
| 2 client/solaris/smartpm/smart/interfaces/gtk/mirrors.py \
| 4 client/solaris/smartpm/smart/interfaces/gtk/packageinfo.py \
| 2 client/solaris/smartpm/smart/interfaces/gtk/packageview.py \
| 2 client/solaris/smartpm/smart/interfaces/gtk/priorities.py \
| 6 client/solaris/smartpm/smart/interfaces/gtk/progress.py \
| 6 client/solaris/smartpm/smart/interfaces/text/interactive.py \
| 2 client/solaris/smartpm/smart/interfaces/text/interface.py \
| 2 client/solaris/smartpm/smart/interfaces/up2date/interface.py \
| 48 - client/solaris/smartpm/smart/media.py \
| 2 client/solaris/smartpm/smart/mirror.py \
| 2 client/solaris/smartpm/smart/pkgconfig.py \
| 2 client/solaris/smartpm/smart/plugins/debdir.py \
| 4 client/solaris/smartpm/smart/plugins/rpmdir.py \
| 4 client/solaris/smartpm/smart/searcher.py \
| 2 client/solaris/smartpm/smart/sorter.py \
| 8 client/solaris/smartpm/smart/transaction.py \
| 4 client/solaris/smartpm/smart/uncompress.py \
| 2 client/solaris/smartpm/smart/util/objdigest.py \
| 2 client/solaris/smartpm/smart/util/pathlocks.py \
| 2 client/solaris/smartpm/smart/util/pexpect.py \
| 88 +- client/tools/action-rpms/rhn-applet-actions/rhn_applet.py \
| 44 - client/tools/osad/invocation.py \
| 4 client/tools/osad/osad.spec \
| 5 client/tools/osad/src/_ConfigParser.py \
| 4 client/tools/osad/src/__init__.py \
| 4 client/tools/osad/src/dispatcher_client.py \
| 10 client/tools/osad/src/jabber_lib.py \
| 94 +- client/tools/osad/src/osa_dispatcher.py \
| 30 client/tools/osad/src/osad.py \
| 42 - client/tools/osad/src/osad_client.py \
| 20 client/tools/osad/src/osad_config.py \
| 16 client/tools/osad/src/rhn_log.py \
| 10 client/tools/osad/test/simple-client.py \
| 6 client/tools/osad/test/simple-dispatcher.py \
| 6 client/tools/osad/test/test_lib.py \
| 10 client/tools/rhn-kickstart/actions/kickstart.py \
| 4 client/tools/rhn-kickstart/actions/kickstart_guest.py \
| 8 client/tools/rhn-kickstart/rhnkickstart/__init__.py \
| 4 client/tools/rhn-kickstart/rhnkickstart/common.py \
| 18 client/tools/rhn-kickstart/rhnkickstart/config.py \
| 4 client/tools/rhn-kickstart/rhnkickstart/kickstart.py \
| 54 - client/tools/rhn-kickstart/rhnkickstart/kickstart_exceptions.py \
| 6 client/tools/rhn-kickstart/rhnkickstart/kickstart_guest.py \
| 120 +-- client/tools/rhn-kickstart/rhnkickstart/lilo.py \
| 14 client/tools/rhn-kickstart/rhnkickstart/virtualization_kickstart_exceptions.py \
| 6 client/tools/rhn-kickstart/test/test-copy-files.py \
| 8 client/tools/rhn-virtualization/actions/virt.py \
| 4 client/tools/rhn-virtualization/virtualization/__init__.py \
| 4 client/tools/rhn-virtualization/virtualization/batching_log_notifier.py \
| 10 client/tools/rhn-virtualization/virtualization/domain_config.py \
| 26 client/tools/rhn-virtualization/virtualization/domain_control.py \
| 12 client/tools/rhn-virtualization/virtualization/domain_directory.py \
| 32 client/tools/rhn-virtualization/virtualization/errors.py \
| 4 client/tools/rhn-virtualization/virtualization/get_config_value.py \
| 4 client/tools/rhn-virtualization/virtualization/init_action.py \
| 4 client/tools/rhn-virtualization/virtualization/notification.py \
| 10 client/tools/rhn-virtualization/virtualization/poller.py \
| 28 client/tools/rhn-virtualization/virtualization/poller_state_cache.py \
| 30 client/tools/rhn-virtualization/virtualization/schedule_poller.py \
| 16 client/tools/rhn-virtualization/virtualization/start_domain.py \
| 12 client/tools/rhn-virtualization/virtualization/state.py \
| 14 client/tools/rhn-virtualization/virtualization/util.py \
| 6 client/tools/rhncfg/actions/ModeController.py \
| 22 client/tools/rhncfg/actions/ModeControllerCreator.py \
| 10 client/tools/rhncfg/actions/Modes.py \
| 32 client/tools/rhncfg/actions/__init__.py \
| 4 client/tools/rhncfg/actions/configfiles.py \
| 26 client/tools/rhncfg/actions/rhn-actions-control.py \
| 18 client/tools/rhncfg/config_client/__init__.py \
| 4 client/tools/rhncfg/config_client/cli_repository.py \
| 6 client/tools/rhncfg/config_client/handler_base.py \
| 4 client/tools/rhncfg/config_client/rhncfgcli_channels.py \
| 4 client/tools/rhncfg/config_client/rhncfgcli_get.py \
| 4 client/tools/rhncfg/config_client/rhncfgcli_list.py \
| 10 client/tools/rhncfg/config_client/rhncfgcli_verify.py \
| 30 client/tools/rhncfg/config_client/rpc_cli_repository.py \
| 24 client/tools/rhncfg/config_common/__init__.py \
| 4 client/tools/rhncfg/config_common/cfg_exceptions.py \
| 4 client/tools/rhncfg/config_common/handler_base.py \
| 8 client/tools/rhncfg/config_common/local_config.py \
| 22 client/tools/rhncfg/config_common/rhn_main.py \
| 4 client/tools/rhncfg/config_common/rpc_wrapper.py \
| 18 client/tools/rhncfg/config_common/transactions.py \
| 42 - client/tools/rhncfg/config_common/utils.py \
| 20 client/tools/rhncfg/config_management/__init__.py \
| 4 client/tools/rhncfg/config_management/rhncfg-manager.py \
| 4 client/tools/rhncfg/config_management/rhncfg_add.py \
| 16 client/tools/rhncfg/config_management/rhncfg_create_channel.py \
| 4 client/tools/rhncfg/config_management/rhncfg_diff.py \
| 6 client/tools/rhncfg/config_management/rhncfg_diff_revisions.py \
| 6 client/tools/rhncfg/config_management/rhncfg_download_channel.py \
| 12 client/tools/rhncfg/config_management/rhncfg_get.py \
| 16 client/tools/rhncfg/config_management/rhncfg_list.py \
| 6 client/tools/rhncfg/config_management/rhncfg_list_channels.py \
| 4 client/tools/rhncfg/config_management/rhncfg_remove.py \
| 6 client/tools/rhncfg/config_management/rhncfg_remove_channel.py \
| 6 client/tools/rhncfg/config_management/rhncfg_revisions.py \
| 6 client/tools/rhncfg/config_management/rhncfg_update.py \
| 4 client/tools/rhncfg/config_management/rhncfg_upload_channel.py \
| 18 client/tools/rhncfg/config_management/rpc_repository.py \
| 64 - client/tools/rhncfg/test/test_action_deploy.py \
| 8 client/tools/rhncfg/test/test_action_diff.py \
| 4 client/tools/rhncfg/test/test_action_script.py \
| 4 client/tools/rhncfg/test/test_action_upload.py \
| 4 client/tools/rhncfg/test/test_maketemp.py \
| 4 client/tools/rhncfg/test/test_upload.py \
| 4 client/tools/rhncustominfo/rhn-custom-info.py \
| 32 client/tools/rhnpush/__init__.py \
| 4 client/tools/rhnpush/archive.py \
| 16 client/tools/rhnpush/connection.py \
| 12 client/tools/rhnpush/rhnpush.py \
| 42 - client/tools/rhnpush/rhnpush_cache.py \
| 6 client/tools/rhnpush/rhnpush_config.py \
| 32 client/tools/rhnpush/rhnpush_confmanager.py \
| 24 client/tools/rhnpush/rhnpush_v2.py \
| 4 client/tools/rhnpush/rpm2mpm.py \
| 12 client/tools/rhnpush/solaris2mpm.py \
| 20 client/tools/rhnpush/test/testUtils.py \
| 4 client/tools/rhnpush/test/test_archive.py \
| 4 client/tools/rhnpush/uploadLib.py \
| 24 client/tools/spacewalk-koan/actions/kickstart.py \
| 6 client/tools/spacewalk-koan/actions/kickstart_guest.py \
| 6 client/tools/spacewalk-koan/spacewalkkoan/__init__.py \
| 4 client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py \
| 34 - java/scripts/api/activationkeytests.py \
| 10 java/scripts/api/channelsoftwaretests.py \
| 2 java/scripts/api/cleanup.py \
| 6 java/scripts/api/kickstartimport.py \
| 2 java/scripts/api/kickstarttests.py \
| 16 java/scripts/api/ks-setup.py \
| 8 java/scripts/api/managechannel.py \
| 2 java/scripts/api/orgtests.py \
| 38 - java/scripts/api/systemsearchtests.py \
| 2 java/scripts/api/systemtests.py \
| 12 java/scripts/api/usertests.py \
| 28 java/scripts/gen-eclipse.py \
| 2 java/scripts/helpUrlCheck.py \
| 2 proxy/installer/rhn_proxy_activate.py \
| 12 proxy/proxy/apacheHandler.py \
| 64 - proxy/proxy/broker/rhnBroker.py \
| 16 proxy/proxy/broker/rhnRepository.py \
| 12 proxy/proxy/redirect/rhnRedirect.py \
| 66 +- proxy/proxy/responseContext.py \
| 4 proxy/proxy/rhnProxyAuth.py \
| 24 proxy/proxy/rhnShared.py \
| 14 rel-eng/bin/sign_unsigned.py \
| 28 rel-eng/packages/osad \
| 2 scripts/link-tree.py \
| 6 scripts/ncsu-rhntools/config.py \
| 4 scripts/ncsu-rhntools/findpackages.py \
| 14 scripts/ncsu-rhntools/groupSummary.py \
| 2 scripts/ncsu-rhntools/oldSystems.py \
| 8 scripts/ncsu-rhntools/rhnapi.py \
| 4 scripts/ncsu-rhntools/rhnstats/pysqlite.py \
| 14 scripts/ncsu-rhntools/rhnstats/rhndb.py \
| 12 scripts/ncsu-rhntools/rhnstats/rhnstats.py \
| 12 scripts/ncsu-rhntools/subscribeRHN.py \
| 8 scripts/update_symlinks.py \
| 34 - search-server/spacewalk-search/scripts/search.py \
| 4 spacecmd/src/lib/activationkey.py \
| 50 - spacecmd/src/lib/configchannel.py \
| 50 - spacecmd/src/lib/cryptokey.py \
| 4 spacecmd/src/lib/distribution.py \
| 10 spacecmd/src/lib/filepreservation.py \
| 6 spacecmd/src/lib/package.py \
| 10 spacecmd/src/lib/report.py \
| 6 spacecmd/src/lib/schedule.py \
| 12 spacecmd/src/lib/snippet.py \
| 4 spacecmd/src/lib/softwarechannel.py \
| 4 spacecmd/src/lib/ssm.py \
| 2 spacecmd/src/lib/user.py \
| 42 - spacecmd/src/lib/utils.py \
| 2 spacewalk/certs-tools/client_config_update.py \
| 8 spacewalk/certs-tools/rhn_bootstrap.py \
| 12 spacewalk/certs-tools/rhn_bootstrap_strings.py \
| 2 spacewalk/certs-tools/rhn_ssl_tool.py \
| 8 spacewalk/certs-tools/sslToolCli.py \
| 4 spacewalk/certs-tools/sslToolConfig.py \
| 10 spacewalk/certs-tools/sslToolLib.py \
| 4 spacewalk/certs-tools/timeLib.py \
| 2 utils/depsolver.py \
| 18 utils/migrateSystemProfile.py \
| 20 399 files changed, 2789 insertions(+), 2786 deletions(-)
New commits:
commit a13c9f8136d8846691deed252286b1cb1f2fb952
Author: Michael Mraka <michael.mraka@redhat.com>
Date: Mon Sep 30 16:12:46 2013 +0200
Automatic commit of package [osad] release [5.11.29-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 8b58a01..49c7e0e 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -17,7 +17,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.11.28
+Version: 5.11.29
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -388,6 +388,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Mon Sep 30 2013 Michael Mraka <michael.mraka@redhat.com> 5.11.29-1
+- removed trailing whitespaces
+
* Tue Aug 06 2013 Tomas Kasparek <tkasparek@redhat.com> 5.11.28-1
- Branding clean-up of proxy stuff in client dir
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index 83e32a6..d2c3e4a 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.11.28-1 client/tools/osad/
+5.11.29-1 client/tools/osad/
commit 0db34805aa0e33d64aeb601c4877e42b9a2638bc
Author: Michael Mraka <michael.mraka@redhat.com>
Date: Mon Sep 30 12:53:06 2013 +0200
removed trailing whitespaces
diff --git a/client/debian/packages-already-in-debian/apt-transport-spacewalk/packages.py \
b/client/debian/packages-already-in-debian/apt-transport-spacewalk/packages.py index \
aec0727..e73d46e 100644
--- a/client/debian/packages-already-in-debian/apt-transport-spacewalk/packages.py
+++ b/client/debian/packages-already-in-debian/apt-transport-spacewalk/packages.py
@@ -1,5 +1,5 @@
#
-# actions.packages dispatcher for Debian clients
+# actions.packages dispatcher for Debian clients
#
# Author: Simon Lukasik
# Lukas Durfina
@@ -29,7 +29,7 @@ from up2date_client import rhnPackageInfo
log = up2dateLog.initLog()
-# file used to keep track of the next time rhn_check
+# file used to keep track of the next time rhn_check
# is allowed to update the package list on the server
LAST_UPDATE_FILE="/var/lib/up2date/dbtimestamp"
@@ -172,9 +172,9 @@ def verify(packages, cache_only=None):
data['name'] = "packages.verify"
data['version'] = 0
ret, missing_packages = pkgUtils.verifyPackages(packages)
-
+
data['verify_info'] = ret
-
+
if len(missing_packages):
data['name'] = "packages.verify.missing_packages"
data['version'] = 0
diff --git a/client/debian/packages-already-in-debian/python-ethtool/pethtool.py \
b/client/debian/packages-already-in-debian/python-ethtool/pethtool.py index \
8042c08..d1a2cb4 100755
--- a/client/debian/packages-already-in-debian/python-ethtool/pethtool.py
+++ b/client/debian/packages-already-in-debian/python-ethtool/pethtool.py
@@ -40,7 +40,7 @@ def usage():
[rx-frames-high N]
[tx-usecs-high N]
[tx-frames-high N]
- [sample-interval N]
+ [sample-interval N]
-i|--driver Show driver information
-k|--show-offload Get protocol offload information
-K|--offload Set protocol offload
@@ -139,7 +139,7 @@ def show_coalesce(interface, args = None):
for tunable in coalkeys:
if tunable not in printed:
printtab("%s %s" % (tunable, coal[tunable]))
-
+
def set_coalesce(interface, args):
try:
coal = ethtool.get_coalesce(interface)
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/reboot.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/reboot.py \
index dd59574..9c99df7 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/reboot.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/reboot.py
@@ -20,7 +20,7 @@ cfg = config.initUp2dateConfig()
log = up2dateLog.initLog()
# action version we understand
-ACTION_VERSION = 2
+ACTION_VERSION = 2
def reboot(test=None, cache_only=None):
if cache_only:
@@ -28,7 +28,7 @@ def reboot(test=None, cache_only=None):
if cfg['noReboot']:
return (38, "Up2date is configured not to allow reboots", {})
-
+
pid = os.fork()
data = {'version': '0'}
if not pid:
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/rhnsd.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/rhnsd.py \
index b8a4c2a..6792cc9 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/rhnsd.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/rhnsd.py
@@ -27,7 +27,7 @@ def __configRhnsd(interval, cache_only=None):
if comps[0] == "INTERVAL":
index = count
count = count + 1
-
+
if index != None:
tmplines[index] = "INTERVAL=%s" % interval
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/systemid.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/systemid.py \
index 5a73653..603f953 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/systemid.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/systemid.py
@@ -23,7 +23,7 @@ def disable(messageText, cache_only=None):
fd.write("Disable lock created on %s. RHN Server Message:\n\n%s\n" % (
time.ctime(time.time()), messageText))
fd.close()
-
+
# done if we survived this long
return(0, "systemId disable lock file has been writen", {})
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/up2date_config.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/up2date_config.py
index 7612c9f..fde78b5 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/up2date_config.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/actions/up2date_config.py
@@ -82,7 +82,7 @@ def writeUp2dateMacro(macroName, macroValue):
value_r = re.compile("%s.*" % macroName)
blank_r = re.compile("\s*")
newfile = []
- for line in lines:
+ for line in lines:
m = value_r.match(line)
if m:
continue
@@ -93,7 +93,7 @@ def writeUp2dateMacro(macroName, macroValue):
continue
newfile.append(line)
-
+
# dont care about blank lines...
newfile.append("\n")
@@ -117,7 +117,7 @@ def main():
configdata['timeStampTest'] = timestamp
print configdata
import pprint
-
+
pprint.pprint(update(configdata))
configdata['serverURL'] = "http://localhost/XMLRPC"
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn-profile-sync.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn-profile-sync.py
index 99a8582..3acd0bc 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn-profile-sync.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn-profile-sync.py
@@ -7,7 +7,7 @@
# Authors:
# Adrian Likins <alikins@redhat.com>
# Preston Brown <pbrown@redhat.com>
-# James Bowes <jbowes@redhat.com>
+# James Bowes <jbowes@redhat.com>
import sys
@@ -25,7 +25,7 @@ from up2date_client import rhnHardware
try:
from virtualization import support
except ImportError:
- support = None
+ support = None
class ProfileCli(rhncli.RhnCli):
@@ -42,10 +42,10 @@ class ProfileCli(rhncli.RhnCli):
print _("Updating package profile...")
rhnPackageInfo.updatePackageProfile()
-
+
print _("Updating hardware profile...")
rhnHardware.updateHardware()
-
+
if support is not None:
print _("Updating virtualization profile...")
support.refresh()
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn_check.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn_check.py \
index 747c26d..c662e3c 100755
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn_check.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn_check.py
@@ -52,7 +52,7 @@ cfg = config.initUp2dateConfig()
log = up2dateLog.initLog()
# action version we understand
-ACTION_VERSION = 2
+ACTION_VERSION = 2
# lock file to check if we're disabled at the server's request
DISABLE_FILE = "/etc/sysconfig/rhn/disable"
@@ -66,7 +66,7 @@ class CheckCli(rhncli.RhnCli):
def __init__(self):
super(CheckCli, self).__init__()
- self.rhns_ca_cert = cfg['sslCACert']
+ self.rhns_ca_cert = cfg['sslCACert']
self.server = None
def main(self):
@@ -170,13 +170,13 @@ class CheckCli(rhncli.RhnCli):
def __run_remote_actions(self):
# the list of caps the client needs
caps = capabilities.Capabilities()
-
+
status_report = CheckCli.__build_status_report()
action = self.__get_action(status_report)
while action != "" and action != {}:
self.__verify_server_capabilities(caps)
-
+
if self.is_valid_action(action):
try:
up2dateAuth.updateLoginInfo()
@@ -191,12 +191,12 @@ class CheckCli(rhncli.RhnCli):
response_headers = self.server.get_response_headers()
caps.populate(response_headers)
# do we actually want to validte here?
- try:
+ try:
caps.validate()
except up2dateErrors.ServerCapabilityError, e:
print e
sys.exit(1)
-
+
def __parse_action_data(self, action):
""" Parse action data and returns (method, params) """
data = action['action']
@@ -212,7 +212,7 @@ class CheckCli(rhncli.RhnCli):
# get a new server object with fresh headers
self.server = CheckCli.__get_server()
-
+
try:
ret = self.server.queue.submit(up2dateAuth.getSystemId(),
action_id, status, message, data)
@@ -232,15 +232,15 @@ class CheckCli(rhncli.RhnCli):
except socket.error:
print "Could not submit to %s.\n"\
"Possible networking problem?" % str(self.server)
- sys.exit(-1)
+ sys.exit(-1)
return ret
-
+
def handle_action(self, action, cache_only=None):
""" Wrapper handler for the action we're asked to do. """
log.log_debug("handle_action", action)
log.log_debug("handle_action actionid = %s, version = %s" % (
action['id'], action['version']))
-
+
(method, params) = self.__parse_action_data(action)
(status, message, data) = CheckCli.__run_action(method, params, \
{'cache_only': cache_only}) ret = 0
@@ -252,7 +252,7 @@ class CheckCli(rhncli.RhnCli):
def is_valid_action(self, action):
log.log_debug("check_action", action)
-
+
# be very paranoid of what we get back
if type(action) != type({}):
print "Got unparseable action response from server"
@@ -274,7 +274,7 @@ class CheckCli(rhncli.RhnCli):
xmlrpclib.Fault(-99, "Can not handle this version"))
return False
return True
-
+
@staticmethod
def __get_server():
""" Initialize a server connection and set up capability info. """
@@ -334,7 +334,7 @@ class CheckCli(rhncli.RhnCli):
method = getMethod.getMethod(method, "/usr/share/rhn/", "actions")
retval = method(*params, **kwargs)
-
+
return retval
@staticmethod
@@ -373,7 +373,7 @@ class CheckCli(rhncli.RhnCli):
def __check_instance_lock():
lock = None
try:
- lock = rhnLockfile.Lockfile('/var/run/rhn_check.pid')
+ lock = rhnLockfile.Lockfile('/var/run/rhn_check.pid')
except rhnLockfile.LockfileLockedException, e:
sys.stderr.write(rhncli.utf8_encode(_("Attempting to run more than one \
instance of rhn_check. Exiting.\n"))) sys.exit(0)
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn_register.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn_register.py \
index 092d5fe..98b0ac8 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn_register.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn_register.py
@@ -7,7 +7,7 @@
# Authors:
# Adrian Likins <alikins@redhat.com>
# Preston Brown <pbrown@redhat.com>
-# James Bowes <jbowes@redhat.com>
+# James Bowes <jbowes@redhat.com>
# Daniel Benamy <dbenamy@redhat.com>
import sys
@@ -27,9 +27,9 @@ from up2date_client import tui
from up2date_client import up2dateErrors
class RhnRegister(rhncli.RhnCli):
- """Runs rhn_register. Can run it in gui or tui mode depending on
+ """Runs rhn_register. Can run it in gui or tui mode depending on
availablility of gui, DISPLAY environment variable, and --nox switch.
-
+
"""
def __init__(self):
super(RhnRegister, self).__init__()
@@ -46,13 +46,13 @@ class RhnRegister(rhncli.RhnCli):
return gui
except:
pass
-
+
return tui
def main(self):
"""RhnCli (the base class) just sets stuff up and then calls this to run
the rest of the program.
-
+
"""
ui = self._get_ui()
ui.main()
@@ -64,7 +64,7 @@ class RhnRegister(rhncli.RhnCli):
sys.exit(1)
except up2dateErrors.RhnServerException:
sys.exit(1)
-
+
# Assuming registration worked, remember to save info (proxy setup,etc)
# from rhncli
self.saveConfig()
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhnreg_ks.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhnreg_ks.py \
index cf1c2f5..a670b56 100755
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhnreg_ks.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhnreg_ks.py
@@ -1,13 +1,13 @@
#!/usr/bin/python
#
-# Registration client for the Red Hat Network for useage with kickstart
+# Registration client for the Red Hat Network for useage with kickstart
# Copyright (c) 1999--2012 Red Hat, Inc. Distributed under GPLv2.
#
# Authors:
# Adrian Likins <alikins@redhat.com>
# James Bowes <jbowes@redhat.com>
#
-# see the output of "--help" for the valid options.
+# see the output of "--help" for the valid options.
#
# The contact info is in the form or a "key: value" one per line.
# valid keys are:
@@ -77,7 +77,7 @@ class RegisterKsCli(rhncli.RhnCli):
if self.options.sslCACert:
rhnreg.cfg.set("sslCACert", self.options.sslCACert)
- if not (self.options.activationkey or
+ if not (self.options.activationkey or
(self.options.username and self.options.password)):
print _("A username and password are required "\
"to register a system.")
@@ -88,7 +88,7 @@ class RegisterKsCli(rhncli.RhnCli):
sys.exit(-1)
rhnreg.getCaps()
-
+
if not self.options.nopackages:
getArch = 0
if rhnreg.cfg['supportsExtendedPackageProfile']:
@@ -97,9 +97,9 @@ class RegisterKsCli(rhncli.RhnCli):
else:
packageList = []
-
+
hardwareList = hardware.Hardware()
-
+
if self.options.profilename:
profilename = self.options.profilename
else:
@@ -114,7 +114,7 @@ class RegisterKsCli(rhncli.RhnCli):
if not virt_uuid is None:
other['virt_uuid'] = virt_uuid
other['virt_type'] = virt_type
-
+
# If specified, send up the EUS channel label for subscription.
if self.options.use_eus_channel:
if self.options.activationkey:
@@ -123,7 +123,7 @@ class RegisterKsCli(rhncli.RhnCli):
if not rhnreg.server_supports_eus():
print _("The server you are registering against does not support \
EUS.") sys.exit(-1)
-
+
channels = rhnreg.getAvailableChannels(self.options.username,
self.options.password)
other['channel'] = channels['default_channel']
@@ -142,7 +142,7 @@ class RegisterKsCli(rhncli.RhnCli):
up2dateErrors.AuthenticationOrAccountCreationError), e:
print "%s" % e.errmsg
sys.exit(1)
-
+
# collect hardware info, inluding hostname
if not self.options.nohardware:
rhnreg.sendHardware(systemId, hardwareList)
@@ -190,14 +190,14 @@ class RegisterKsCli(rhncli.RhnCli):
hostname = hw.get('hostname')
ipaddr = hw.get('ipaddr')
ip6addr = hw.get('ipaddr6')
-
+
if hostname:
profileName = idn_pune_to_unicode(hostname)
elif ipaddr:
profileName = ipaddr
elif ip6addr:
profileName = ip6addr
-
+
if not profileName:
print _("A profilename was not specified, "\
"and hostname and IP address could not be determined "\
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py
index 6b7a3f2..dd7547e 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py
@@ -42,19 +42,19 @@ class RhnChooseServerWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.ChooseServe needsparent = 1
needsnetwork = 1
noSidebar = True
-
+
def __init__(self):
RhnRegisterFirstbootGuiWindow.__init__(self)
rhnregGui.ChooseServerPage.__init__(self)
if rhnreg.registered():
self.skipme = True
-
+
def _getVbox(self):
return self.chooseServerPageVbox()
-
+
def updatePage(self):
self.chooseServerPagePrepare()
-
+
def apply(self, *args):
"""Returns True to change the page (to the one set)."""
try:
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py
index ed68ad0..b0bd842 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py
@@ -59,7 +59,7 @@ class RhnCreateProfileWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.CreateProf
def updatePage(self):
self.createProfilePagePrepare()
-
+
def _getVbox(self):
return self.createProfilePageVbox()
@@ -72,7 +72,7 @@ class RhnCreateProfileWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.CreateProf ret = self.createProfilePageApply()
if ret:
return None
-
+
return True
childWindow = RhnCreateProfileWindow
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py
index 5e3356c..ff4fcd5 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py
@@ -40,16 +40,16 @@ class RhnFinishWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.FinishPage): needsparent = 1
needsnetwork = 1
noSidebar = True
-
+
def __init__(self):
RhnRegisterFirstbootGuiWindow.__init__(self)
rhnregGui.FinishPage.__init__(self)
if rhnreg.registered():
self.skipme = True
-
+
def _getVbox(self):
return self.finishPageVbox()
-
+
def updatePage(self):
## if rhnregGui.hasBaseChannelAndUpdates():
## self.druid.finish.set_label(_("_Finish"))
@@ -60,12 +60,12 @@ class RhnFinishWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.FinishPage): self.finishPagePrepare()
## self.mainWin.set_title(title)
## self.finishPage.set_title(title)
-
+
def apply(self, *args):
- """Returns None to stay on the same page. Anything else will cause
- firstboot to advance but True is generally used. This is different from
+ """Returns None to stay on the same page. Anything else will cause
+ firstboot to advance but True is generally used. This is different from
the gnome druid in rhn_register.
-
+
"""
up2DateConfig = config.initUp2dateConfig()
up2DateConfig.save()
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py
index ba6adc9..f92fa8d 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py
@@ -60,7 +60,7 @@ class RhnLoginWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.LoginPage): # self.getCaps()
self.loginPagePrepare()
self.goingNextFromNewAccountDialog = False
-
+
def grabFocus(self):
# We must set focus where we want it here. Setting it in updatePage
# doesn't work.
@@ -70,25 +70,25 @@ class RhnLoginWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.LoginPage): return self.loginPageVbox()
def apply(self, *args):
- """Returns None to stay on the same page. Anything else will cause
- firstboot to advance but True is generally used. This is different from
+ """Returns None to stay on the same page. Anything else will cause
+ firstboot to advance but True is generally used. This is different from
the gnome druid in rhn_register.
-
+
"""
if self.doDebug:
print "applying rhn_login_gui"
-
+
# This is a hack. This function will get called if they click next on
- # the login page (the else) or when they create an account (the if). In
+ # the login page (the else) or when they create an account (the if). In
# that case we don't want to do the normal logging in stuff.
if self.goingNextFromNewAccountDialog:
assert rhnregGui.newAccount is True
else:
if self.loginPageVerify():
return None
-
+
assert rhnregGui.newAccount is False
-
+
if self.loginPageApply():
return None
@@ -97,12 +97,12 @@ class RhnLoginWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.LoginPage):
self.parent.setPage('rhn_create_profile_gui')
return True
-
+
def goToPageAfterLogin(self):
# This is a hack. More info above.
self.goingNextFromNewAccountDialog = True
self.parent.nextClicked()
-
+
def onLoginPageNext(self, dummy=None, dummy2=None):
# This is a hackish way to support enter advancing
self.parent.nextClicked()
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py
index 190e348..54e606b 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py
@@ -41,23 +41,23 @@ class RhnProvideCertificateWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.Provi needsparent = 1
needsnetwork = 1
noSidebar = True
-
+
def __init__(self):
RhnRegisterFirstbootGuiWindow.__init__(self)
rhnregGui.ProvideCertificatePage.__init__(self)
if rhnreg.registered():
self.skipme = True
-
+
def _getVbox(self):
return self.provideCertificatePageVbox()
-
+
def apply(self, *args):
"""Returns True to change the page or None to stay on the same page."""
status = self.provideCertificatePageApply()
if status == 0: # cert was installed
return True
elif status == 1: # the user doesn't want to provide a cert right now
- # TODO write a message to disk like the other cases? need to decide
+ # TODO write a message to disk like the other cases? need to decide
# how we want to do error handling in general.
self.parent.setPage("rhn_finish_gui")
return True
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_register_firstboot_gui_window.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_register_firstboot_gui_window.py
index 60725ac..2a8382a 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_register_firstboot_gui_window.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_register_firstboot_gui_window.py
@@ -13,7 +13,7 @@ import rhnregGui
class RhnRegisterFirstbootGuiWindow(FirstbootModuleWindow):
"""This is a base class for our firstboot screens. It shouldn't be used
directly.
-
+
"""
needsparent = 1
@@ -37,9 +37,9 @@ class RhnRegisterFirstbootGuiWindow(FirstbootModuleWindow):
def launch(self, doDebug=None):
"""Firstboot calls this to set up the screen. It will use the _getVbox
- method provided by the derived classes to get the contents of the
+ method provided by the derived classes to get the contents of the
screen.
-
+
"""
self.doDebug = doDebug
if self.doDebug:
@@ -55,11 +55,11 @@ class RhnRegisterFirstbootGuiWindow(FirstbootModuleWindow):
internalVBox.pack_start(vbox, True)
self.mainVBox.pack_start(internalVBox, True)
-
+
# Set up cursor changing functions. Overriding functions that aren't in
- # classes like this could be called a hack, but I think it's the best
+ # classes like this could be called a hack, but I think it's the best
# we can do with the current overall setup and isn't too bad.
- # Having it here will cause this to get called once per module, but I'm
+ # Having it here will cause this to get called once per module, but I'm
# not sure if it'll work to put it in the constructor.
def mySetBusyCursor():
cursor = gtk.gdk.Cursor(gtk.gdk.WATCH)
@@ -82,7 +82,7 @@ class RhnRegisterFirstbootGuiWindow(FirstbootModuleWindow):
gtk.main_iteration(False)
rhnregGui.setBusyCursor = mySetBusyCursor
rhnregGui.setArrowCursor = mySetArrowCursor
-
+
return self.mainVBox, self.icon, self.windowTitle
def grabFocus(self):
@@ -98,7 +98,7 @@ class RhnRegisterFirstbootGuiWindow(FirstbootModuleWindow):
text = error
dlg = messageWindow.ErrorDialog(text)
self._goImmediatelyToFinish()
-
+
def _goImmediatelyToFinish(self):
self.parent.setPage("rhn_finish_gui")
def dummyApply(self, *args):
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py
index 145fd13..19507a0 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py
@@ -39,24 +39,24 @@ class RhnReviewWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.ReviewSubscriptio needsparent = 1
needsnetwork = 1
noSidebar = True
-
+
def __init__(self):
RhnRegisterFirstbootGuiWindow.__init__(self)
rhnregGui.ReviewSubscriptionPage.__init__(self)
if rhnreg.registered():
self.skipme = True
-
+
def _getVbox(self):
return self.reviewSubscriptionPageVbox()
-
+
def updatePage(self):
self.reviewSubscriptionPagePrepare()
-
+
def apply(self, *args):
- """Returns None to stay on the same page. Anything else will cause
- firstboot to advance but True is generally used. This is different from
+ """Returns None to stay on the same page. Anything else will cause
+ firstboot to advance but True is generally used. This is different from
the gnome druid in rhn_register.
-
+
"""
return True
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py
index 10ab1c6..b540092 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py
@@ -38,7 +38,7 @@ class RhnStartWindow(RhnRegisterFirstbootGuiWindow):
windowTitle = moduleName
shortMessage = _("Register with Red Hat Network")
needsparent = 1
-
+
def __init__(self):
RhnRegisterFirstbootGuiWindow.__init__(self)
self.start_page = None
@@ -52,13 +52,13 @@ class RhnStartWindow(RhnRegisterFirstbootGuiWindow):
else:
self.start_page = NoNetworkPage()
return self.start_page.startPageVbox()
-
+
def apply(self, *args):
"""Returns True to change the page (to the one set)."""
if not self.start_page.startPageRegisterNow():
dlg = rhnregGui.ConfirmQuitDialog()
if not dlg.rc:
- self.parent.setPage("rhn_start_gui")
+ self.parent.setPage("rhn_start_gui")
else:
self.parent.setPage("rhn_finish_gui")
return True
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py
index 0bfdc9f..cc83f5c 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py
@@ -58,7 +58,7 @@ class moduleClass(Module):
return RESULT_JUMP
if ret:
return RESULT_FAILURE
-
+
return RESULT_SUCCESS
def createScreen(self):
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py
index 7d15316..2fee941 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py
@@ -51,7 +51,7 @@ class moduleClass(Module):
if status == 0: # cert was installed
return RESULT_SUCCESS
elif status == 1: # the user doesn't want to provide a cert right now
- # TODO write a message to disk like the other cases? need to decide
+ # TODO write a message to disk like the other cases? need to decide
# how we want to do error handling in general.
interface.moveToPage(moduleTitle=_("Finish Updates Setup"))
return RESULT_JUMP
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/rhn_start_gui.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/rhn_start_gui.py
index 3f883a0..0075fac 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/rhn_start_gui.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/firstboot/rhn_start_gui.py
@@ -98,7 +98,7 @@ class moduleClass(Module):
self.start_page = NoNetworkPage()
self.skip_registration = True
return self.start_page.startPageVbox()
-
+
class KsRegisteredPage:
def __init__(self):
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/capabilities.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/capabilities.py
index 1e22af6..60ead41 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/capabilities.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/capabilities.py
@@ -30,11 +30,11 @@ def parseCap(capstring):
except ValueError:
# Bad directive: not in 'a = b' format
continue
-
+
# parse out the version
# lets give it a shot sans regex's first...
(key,version) = string.split(key_version, "(", 1)
-
+
# just to be paranoid
if version[-1] != ")":
print "something broke in parsing the capabilited headers"
@@ -171,20 +171,20 @@ class Capabilities(UserDict.UserDict):
def hasCapability(self, capability, version=None):
"""Checks if the server supports a capability and optionally a version.
Returns True or False.
-
+
This complements the neededCaps mechanism provided by this module.
- Using hasCapability makes it easier to do something only if the server
- supports it or to put workaround code in the user of this class. The
+ Using hasCapability makes it easier to do something only if the server
+ supports it or to put workaround code in the user of this class. The
neededCaps mechanism makes it easier to put workaround code in this
module, which makes sense if it is to be shared.
-
- 'capability' should be a string such as 'registration.foobar'. It can
- be a capability in 'neededCaps' above or one that isn't there. 'version'
+
+ 'capability' should be a string such as 'registration.foobar'. It can
+ be a capability in 'neededCaps' above or one that isn't there. 'version'
can be a string (where isdigit() is True) or an int.
-
+
"""
assert version is None or str(version).isdigit()
-
+
if not self.data.has_key(capability):
return False
if version:
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/clientCaps.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/clientCaps.py
index dbc0665..e62238a 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/clientCaps.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/clientCaps.py
@@ -57,13 +57,13 @@ def loadLocalCaps(capsDir = "/etc/sysconfig/rhn/clientCaps.d"):
caps.data[cap] = data
# print caps.data
-
+
loadLocalCaps()
# register local caps we require.
def registerCap(cap, data):
caps.data[cap] = data
-
+
# figure out something pretty here
registerCap("packages.runTransaction", {'version':'1', 'value':'1'})
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/config.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/config.py
index 26cbda3..ee6d5aa 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/config.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/config.py
@@ -65,7 +65,7 @@ class ConfigFile:
self.fileName = filename
if self.fileName:
self.load()
-
+
def load(self, filename = None):
if filename:
self.fileName = filename
@@ -74,14 +74,14 @@ class ConfigFile:
if not os.access(self.fileName, os.R_OK):
# print "warning: can't access %s" % self.fileName
return
-
+
f = open(self.fileName, "r")
for line in f.readlines():
# strip comments
if line.find('#') == 0:
continue
- line = line.strip()
+ line = line.strip()
if not line:
continue
@@ -143,7 +143,7 @@ class ConfigFile:
if not os.access(os.path.dirname(self.fileName), os.R_OK):
print _("%s was not found" % os.path.dirname(self.fileName))
return
-
+
f = open(self.fileName+'.new', "w")
os.chmod(self.fileName, 0600)
@@ -175,14 +175,14 @@ class ConfigFile:
def update(self, dict):
self.dict.update(dict)
-
+
# we return None when we reference an invalid key instead of
# raising an exception
def __getitem__(self, name):
if self.dict.has_key(name):
return self.dict[name][1]
- return None
-
+ return None
+
def __setitem__(self, name, value):
if self.dict.has_key(name):
val = self.dict[name]
@@ -248,11 +248,11 @@ class Config:
if self.stored.has_key(name):
return self.stored[name]
return None
-
+
# These function expose access to the peristent storage for
# updates and saves
def info(self, name): # retrieve comments
- return self.stored.info(name)
+ return self.stored.info(name)
def save(self):
self.stored.save()
@@ -327,11 +327,11 @@ def initUp2dateConfig(cfg_file = "/etc/sysconfig/rhn/up2date"):
cfg
except NameError:
cfg = None
-
+
if cfg == None:
cfg = Config(cfg_file)
cfg["isatty"] = False
if sys.stdout.isatty():
cfg["isatty"] = True
-
+
return cfg
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/debUtils.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/debUtils.py
index 1556b33..95fd617 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/debUtils.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/debUtils.py
@@ -15,7 +15,7 @@ _ = t.ugettext
# FIXME: After Debian bug 187019 is resolved
def verifyPackages(packages):
cache = apt.Cache()
- missing_packages = []
+ missing_packages = []
for package in packages:
pkg = cache[package[0]]
if pkg == None or not pkg.is_installed:
@@ -28,7 +28,7 @@ def parseVRE(version):
release = '0'
if version.find(':') != -1:
epoch, version = version.split(':')
- if version.find('-') != -1:
+ if version.find('-') != -1:
tmp = version.split('-')
version = '-'.join(tmp[:-1])
release = tmp[-1]
@@ -43,7 +43,7 @@ def installTime(pkg_name):
#FIXME: Using Apt cache might not be an ultimate solution.
# It could be better to parse /var/lib/dpkg/status manually.
-# Apt cache might not contain all the packages.
+# Apt cache might not contain all the packages.
def getInstalledPackageList(msgCallback = None, progressCallback = None,
getArch=None, getInfo = None):
""" Return list of packages. Package is dict with following keys:
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/getMethod.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/getMethod.py
index 1cd9bb1..3c467d9 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/getMethod.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/getMethod.py
@@ -24,7 +24,7 @@ def sanity(methodNameComps):
# Verifies if all the components have proper names
#"""
# Allowed characters in each string
- alpha = string.ascii_lowercase + string.ascii_uppercase
+ alpha = string.ascii_lowercase + string.ascii_uppercase
allowedChars = alpha + string.digits + '_'
for comp in methodNameComps:
if not len(comp):
@@ -45,7 +45,7 @@ def getMethod(methodName, abspath, baseClass):
#route/label.
#"""
# First split the method name
- methodNameComps = string.split(baseClass, '.') + string.split(methodName, '.')
+ methodNameComps = string.split(baseClass, '.') + string.split(methodName, '.')
# Sanity checks
sanity(methodNameComps)
# Build the path to the file
@@ -58,7 +58,7 @@ def getMethod(methodName, abspath, baseClass):
# Okay, go on
continue
# Try to load this as a file
- for extension in ['py', 'pyc', 'pyo']:
+ for extension in ['py', 'pyc', 'pyo']:
if os.path.isfile("%s.%s" % (path, extension)):
# Yes, this is a file
break
@@ -131,7 +131,7 @@ if __name__ == '__main__':
try:
method = getMethod(m, '.', 'Actions')
except GetMethodException, e:
- print "Error getting the method %s: %s" % (m,
+ print "Error getting the method %s: %s" % (m,
string.join(map(str, e.args)))
else:
method()
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/haltree.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/haltree.py
index 4c8c750..c59715c 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/haltree.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/haltree.py
@@ -4,14 +4,14 @@
# HalTree is a way to organize the mess of data you get from hal. In general,
# if you want to get all the information about every device in the system, you
# end up with a list of dicts, where each dict contains the property name/values
-# for a device. This list isn't very useful as the hal data is actually
+# for a device. This list isn't very useful as the hal data is actually
# organized into a tree. For example, you have the computer as the head, then
# there may be a scsi card plugged in. That in turn will have scsi channels
# and luns, which scsi devices may be connected to. So this module will help
# you reorganize your hal data back to the way they were intended.
#
# HalTree Usage:
-#
+#
# The tree gets built one device at a time. Once you've created a HalTree
# object, devices get added to the tree with HalTree.add(hw_dev_dict). The
# devices can be added in any particular order, and the tree gets properly
@@ -33,7 +33,7 @@ class HalDevice:
self.properties = properties
self.children = []
self.classification = None
-
+
if properties.has_key('info.parent'):
self.parent_udi = properties['info.parent']
else:
@@ -46,8 +46,8 @@ class HalDevice:
for property, value in self.properties.items():
print " ", property," ==> ", value
-
-
+
+
class HalTree:
def __init__ (self):
@@ -65,10 +65,10 @@ class HalTree:
self.no_parent_yet.append(hal_device)
else: #if it doesn't have a parent, it must be the head 'computer'
self.head = hal_device
-
+
#check to see if there are any children waiting for this dev
self.__get_lost_children(hal_device)
-
+
def __get_lost_children(self, hal_device):
found_list = []
@@ -81,7 +81,7 @@ class HalTree:
self.no_parent_yet.remove(dev)
def __find_node(self, udi):
- """
+ """
This takes a node in the HalDevice tree and returns the HalDevice with
the given udi.
"""
@@ -105,10 +105,10 @@ class HalTree:
if res:
return res
return None
-
+
def print_tree(self):
self.__print_dev_tree(self.head, "")
-
+
def __print_dev_tree(self, node, indent):
print indent, node.udi
print indent, "CLASS:", node.classification
@@ -118,7 +118,7 @@ class HalTree:
print indent + " ", "%-20s ==> %s" % (name, \
hex(int(property))) else:
print indent + " ", "%-20s ==> %s" % (name, property)
- elif (type(property) == types.IntType):
+ elif (type(property) == types.IntType):
print indent + " ", "%-20s ==> %s" % (name, hex(int(property)))
else:
print indent + " ", "%-20s ==> %s" % (name, property)
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/hardware.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/hardware.py
index 42b4423..467604c 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/hardware.py
@@ -134,10 +134,10 @@ def read_installinfo():
continue
strippedstring = vals[0].strip()
vals[0] = strippedstring
-
+
installdict[vals[0]] = ''.join(vals[1:]).strip()
return installdict
-
+
def cpu_count():
""" returns number of CPU in system
@@ -200,7 +200,7 @@ def read_cpuinfo():
# class, desc (required to identify the hardware device)
# count, type, model, model_number, model_ver, model_rev
# bogomips, platform, speed, cache
-
+
hwdict = { 'class': "CPU",
"desc" : "Processor",
}
@@ -212,7 +212,7 @@ def read_cpuinfo():
hwdict['platform'] = 'x86_64'
else:
hwdict['platform'] = "i386"
-
+
hwdict['count'] = count
hwdict['type'] = get_entry(tmpdict, 'vendor_id')
hwdict['model'] = get_entry(tmpdict, 'model name')
@@ -284,7 +284,7 @@ def read_cpuinfo():
hwdict['speed'] = int(round(float(mhz_speed)) - 1)
except ValueError:
hwdict['speed'] = -1
-
+
elif uname in ['s390', 's390x']:
tmpdict = {}
for cpu in cpulist.split("\n"):
@@ -305,7 +305,7 @@ def read_cpuinfo():
hwdict['other'] = get_entry(tmpdict, 'features')
hwdict['speed'] = 0
-
+
else:
# XXX: expand me. Be nice to others
hwdict['platform'] = uname
@@ -331,7 +331,7 @@ def read_cpuinfo():
else:
if hwdict["count"] == 0: # we have at least one
hwdict["count"] = 1
-
+
# This whole things hurts a lot.
return hwdict
@@ -380,10 +380,10 @@ def read_memory_2_6():
#print blobs
value = blobs[1].strip()
meminfo_dict[key] = value
-
+
memdict = {}
memdict["class"] = "MEMORY"
-
+
total_str = meminfo_dict['MemTotal']
blips = total_str.split(" ")
total_k = long(blips[0])
@@ -443,13 +443,13 @@ def findHostByRoute():
s.close()
continue
s.close()
-
- # Override hostname with the one in /etc/sysconfig/network
+
+ # Override hostname with the one in /etc/sysconfig/network
# for bz# 457953
-
+
if os.access("/etc/sysconfig/network", os.R_OK):
networkinfo = open("/etc/sysconfig/network", "r").readlines()
-
+
for info in networkinfo:
if not len(info):
continue
@@ -461,7 +461,7 @@ def findHostByRoute():
if vals[0] == "HOSTNAME":
hostname = ''.join(vals[1:]).strip()
break
-
+
if hostname == None or hostname == 'localhost.localdomain':
hostname = "unknown"
return hostname, intf, intf6
@@ -486,7 +486,7 @@ def get_slave_hwaddr(master, slave):
bonding.close()
return hwaddr
-
+
def read_network():
netdict = {}
netdict['class'] = "NETINFO"
@@ -530,7 +530,7 @@ def read_network_interfaces():
hwaddr = ethtool.get_hwaddr(interface)
except:
hwaddr = ""
-
+
# slave devices can have their hwaddr changed
try:
master = os.readlink('/sys/class/net/%s/master' % interface)
@@ -586,25 +586,25 @@ def read_network_interfaces():
return intDict
-# Read DMI information via hal.
+# Read DMI information via hal.
def read_dmi():
dmidict = {}
- dmidict["class"] = "DMI"
+ dmidict["class"] = "DMI"
# Try to obtain DMI info if architecture is i386, x86_64 or ia64
uname = os.uname()[4].lower()
if not (uname[0] == "i" and uname[-2:] == "86") and not (uname == "x86_64"):
return dmidict
- # System Information
+ # System Information
vendor = dmi_vendor()
if vendor:
dmidict["vendor"] = vendor
-
+
product = get_dmi_data('/dmidecode/SystemInfo/ProductName')
if product:
dmidict["product"] = product
-
+
version = get_dmi_data('/dmidecode/SystemInfo/Version')
if version:
system = product + " " + version
@@ -613,7 +613,7 @@ def read_dmi():
# BaseBoard Information
dmidict["board"] = get_dmi_data('/dmidecode/BaseBoardInfo/Manufacturer')
- # Bios Information
+ # Bios Information
vendor = get_dmi_data('/dmidecode/BIOSinfo/Vendor')
if vendor:
dmidict["bios_vendor"] = vendor
@@ -629,27 +629,27 @@ def read_dmi():
chassis_serial = get_dmi_data('/dmidecode/ChassisInfo/SerialNumber')
chassis_tag = get_dmi_data('/dmidecode/ChassisInfo/AssetTag')
board_serial = get_dmi_data('/dmidecode/BaseBoardInfo/SerialNumber')
-
+
system_serial = get_dmi_data('/dmidecode/SystemInfo/SerialNumber')
-
+
dmidict["asset"] = "(%s: %s) (%s: %s) (%s: %s) (%s: %s)" % ("chassis", \
chassis_serial,
"chassis", chassis_tag,
"board", board_serial,
"system", system_serial)
-
- # Clean up empty entries
+
+ # Clean up empty entries
for k in dmidict.keys()[:]:
if dmidict[k] is None:
del dmidict[k]
# Finished
-
+
return dmidict
def get_hal_system_and_smbios():
try:
if using_gudev:
props = get_computer_info()
- else:
+ else:
computer = get_hal_computer()
props = computer.GetAllProperties()
except Exception, e:
@@ -696,7 +696,7 @@ def Hardware():
hal_status, dbus_status = check_hal_dbus_status()
hwdaemon = 1
if hal_status or dbus_status:
- # if status != 0 haldaemon or messagebus service not running.
+ # if status != 0 haldaemon or messagebus service not running.
# set flag and dont try probing hardware and DMI info
# and warn the user.
log = up2dateLog.initLog()
@@ -708,14 +708,14 @@ def Hardware():
if hwdaemon:
try:
ret = read_hal()
- if ret:
+ if ret:
allhw = ret
except:
# bz253596 : Logging Dbus Error messages instead of printing on \
stdout log = up2dateLog.initLog()
msg = "Error reading hardware information: %s\n" % (sys.exc_type)
log.log_me(msg)
-
+
# all others return individual arrays
# cpu info
@@ -724,26 +724,26 @@ def Hardware():
if ret: allhw.append(ret)
except:
print _("Error reading cpu information:"), sys.exc_type
-
+
# memory size info
try:
ret = read_memory()
if ret: allhw.append(ret)
except:
print _("Error reading system memory information:"), sys.exc_type
-
+
cfg = config.initUp2dateConfig()
if not cfg["skipNetwork"]:
# minimal networking info
try:
ret = read_network()
- if ret:
+ if ret:
allhw.append(ret)
except:
print _("Error reading networking information:"), sys.exc_type
# dont like catchall exceptions but theres not
# really anything useful we could do at this point
- # and its been trouble prone enough
+ # and its been trouble prone enough
# minimal DMI info
try:
@@ -755,7 +755,7 @@ def Hardware():
log = up2dateLog.initLog()
msg = "Error reading DMI information: %s\n" % (sys.exc_type)
log.log_me(msg)
-
+
try:
ret = read_installinfo()
if ret:
@@ -770,7 +770,7 @@ def Hardware():
allhw.append(ret)
except:
print _("Error reading network interface information:"), sys.exc_type
-
+
# all Done.
return allhw
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/messageWindow.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/messageWindow.py
index 11dcc3a..44e7240 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/messageWindow.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/messageWindow.py
@@ -110,25 +110,25 @@ class YesNoDialog(MessageWindow):
class BulletedOkDialog:
"""A dialog box that can have one more sections of text. Each section can
be standard blob of text or a bulleted item.
-
+
"""
def __init__ (self, title=None, parent=None):
self.rc = None
self.dialog = gtk.Dialog(title, parent, 0, ("Close", 1))
self.dialog.set_has_separator(False)
- # Vbox to contain just the stuff that will be add to the dialog with
+ # Vbox to contain just the stuff that will be add to the dialog with
# addtext
self.vbox = gtk.VBox(spacing)
self.vbox.set_border_width(15)
# Put our vbox into the top part of the dialog
self.dialog.get_children()[0].pack_start(self.vbox, expandúlse)
-
+
def add_text(self, text):
label = gtk.Label(text)
label.set_alignment(0, 0)
label.set_line_wrap(True)
self.vbox.pack_start(label, expandúlse)
-
+
def add_bullet(self, text):
label = gtk.Label(text)
label.set_alignment(0, 0)
@@ -139,7 +139,7 @@ class BulletedOkDialog:
hbox.pack_start(bullet, expandúlse)
hbox.pack_start(label, expandúlse)
self.vbox.pack_start(hbox, expandúlse)
-
+
def run(self):
# addFrame(self.dialog) # Need to do this differently if we want it
self.dialog.set_position(gtk.WIN_POS_CENTER)
@@ -150,6 +150,6 @@ class BulletedOkDialog:
self.rc = 0
self.dialog.destroy()
gtk.main_iteration()
-
+
def getrc (self):
return self.rc
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/progress.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/progress.py
index 57a2afb..66208a2 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/progress.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/progress.py
@@ -25,7 +25,7 @@ class Progress:
self.progressWindow.hide()
while gtk.events_pending():
gtk.main_iteration(False)
-
+
del self
def setLabel(self, text):
@@ -33,15 +33,15 @@ class Progress:
label.set_text(text)
while gtk.events_pending():
gtk.main_iteration(False)
-
+
# the xmlrpc callbacks only use the first three
# the GET style use all 4, so pass em but dont use them
def setProgress(self, amount, total, speed = 0, secs = 0):
if total:
i = float(amount) / total
- else:
+ else:
i = 1
-
+
if i > 1:
i = 1
if i > self.lastProgress + .01 or i == 1:
@@ -64,7 +64,7 @@ class Progress:
gtk.main_iteration(False)
self.progressWindow.destroy()
-
+
def noop(self, win, event):
return True
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnChannel.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnChannel.py
index 34b70cf..6ab4541 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnChannel.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnChannel.py
@@ -19,7 +19,7 @@ class rhnChannel:
for kw in kwargs.keys():
self.dict[kw] = kwargs[kw]
-
+
def __getitem__(self, item):
return self.dict[item]
@@ -100,7 +100,7 @@ def getChannels(force=None, label_whitelist=None):
for chan in up2dateChannels:
if label_whitelist and not label_whitelist.has_key(chan['label']):
continue
-
+
channel = rhnChannel(type = 'up2date', url = config.getServerlURL())
for key in chan.keys():
if key == "last_modified":
@@ -113,7 +113,7 @@ def getChannels(force=None, label_whitelist=None):
raise up2dateErrors.NoChannelsError(_("This system may not be updated until \
it is associated with a channel."))
return selected_channels
-
+
def setChannels(tempchannels):
global selected_channels
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnHardware.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnHardware.py
index f52ac6c..56f7287 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnHardware.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnHardware.py
@@ -6,7 +6,7 @@ import hardware
def updateHardware():
s = rpcServer.getServer()
-
+
hardwareList = hardware.Hardware()
s.registration.refresh_hw_profile(up2dateAuth.getSystemId(),
hardwareList)
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhncli.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhncli.py
index d71a22a..a1ead70 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhncli.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhncli.py
@@ -16,7 +16,7 @@
# Authors:
# Adrian Likins <alikins@redhat.com>
# Preston Brown <pbrown@redhat.com>
-# James Bowes <jbowes@redhat.com>
+# James Bowes <jbowes@redhat.com>
#
# In addition, as a special exception, the copyright holders give
# permission to link the code of portions of this program with the
@@ -84,7 +84,7 @@ class RhnCli(object):
self.options = None
self.args = None
-
+
self.hasGui = False
def run(self):
@@ -132,7 +132,7 @@ class RhnCli(object):
def initialize(self):
(self.options, self.args) = self.optparser.parse_args()
-
+
RhnCli.__setDebugLevel(self.options.verbose)
# see if were running as root
@@ -218,7 +218,7 @@ class RhnCli(object):
def __setDebugLevel(level):
cfg = config.initUp2dateConfig()
# figure out the debug level
- cfg["debug"] = cfg["debug"] + level
+ cfg["debug"] = cfg["debug"] + level
if cfg["debug"] > 2:
pkgUtils.setDebugVerbosity()
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnreg.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnreg.py
index 4e76326..d4bc979 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnreg.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnreg.py
@@ -28,7 +28,7 @@ import xmlrpclib
try:
from virtualization import support
except ImportError:
- support = None
+ support = None
import gettext
t = gettext.translation('rhn-client-tools', fallback=True)
@@ -82,7 +82,7 @@ def getOemInfo():
(key, value) = i.split(':')
except ValueError:
raise up2dateErrors.OemInfoFileError(i), None, sys.exc_info()[2]
-
+
info[key] = value.strip()
return info
@@ -114,21 +114,21 @@ def _write_secure_file(secure_file, file_contents):
dir_name = os.path.dirname(secure_file)
if not os.access(dir_name, os.W_OK):
return False
-
+
if os.access(secure_file, os.F_OK):
# already have file there; let's back it up
try:
os.rename(secure_file, secure_file + '.save')
except:
return False
-
+
fd = os.open(secure_file, os.O_WRONLY | os.O_CREAT, 0600)
fd_file = os.fdopen(fd, 'w')
try:
fd_file.write(file_contents)
finally:
fd_file.close()
-
+
return True
def writeSystemId(systemId):
@@ -140,7 +140,7 @@ def writeSystemId(systemId):
removeSystemRegisterRemindFile()
updateRhsmStatus()
-
+
return res
def writeHWCode(hw_activation_code):
@@ -160,7 +160,7 @@ def get_virt_info():
3. Check /sys/hypervisor/uuid. If exists and is non-zero, we know
the system is a para-virt guest; exit.
4. If non of the above checks worked; we know we have a
- non-xen-enabled system; exit.
+ non-xen-enabled system; exit.
"""
# First, check whether /proc/xen/xsd_port exists. If so, we know this is
@@ -169,7 +169,7 @@ def get_virt_info():
if os.path.exists("/proc/xen/xsd_port"):
# Ok, we know this is *at least* a host system. However, it may
# also be a fully-virt guest. Check for that next. If it is, we'll
- # just report that instead since we only support one level of
+ # just report that instead since we only support one level of
# virtualization.
(uuid, virt_type) = get_fully_virt_info()
return (uuid, virt_type)
@@ -193,7 +193,7 @@ def get_virt_info():
def get_para_virt_info():
"""
- This function checks /sys/hypervisor/uuid to see if the system is a
+ This function checks /sys/hypervisor/uuid to see if the system is a
para-virt guest. It returns a (uuid, virt_type) tuple.
"""
try:
@@ -211,7 +211,7 @@ def get_para_virt_info():
def get_fully_virt_info():
"""
- This function looks in the SMBIOS area to determine if this is a
+ This function looks in the SMBIOS area to determine if this is a
fully-virt guest. It returns a (uuid, virt_type) tuple.
"""
vendor = hardware.dmi_vendor()
@@ -231,13 +231,13 @@ def welcomeText():
s = rhnserver.RhnServer()
return s.registration.welcome_message()
-
+
def getCaps():
s = rhnserver.RhnServer()
# figure out if were missing any needed caps
s.capabilities.validate()
-
+
def reserveUser(username, password):
s = rhnserver.RhnServer()
return s.registration.reserve_user(username, password)
@@ -249,7 +249,7 @@ def registerUser(username, password):
class RegistrationResult:
- def __init__(self, systemId, channels, failedChannels, systemSlots,
+ def __init__(self, systemId, channels, failedChannels, systemSlots,
failedSystemSlots, universalActivationKey, rawDict=None):
# TODO Get rid of rawDict
self._systemId = systemId
@@ -262,40 +262,40 @@ class RegistrationResult:
else:
self._universalActivationKey = None
self.rawDict = rawDict
-
+
def getSystemId(self):
return self._systemId
-
+
def getChannels(self):
return self._channels
-
+
def getFailedChannels(self):
return self._failedChannels
-
+
def getSystemSlots(self):
return self._systemSlots
-
+
def getSystemSlotDescriptions(self):
return map(self._getSlotDescription, self._systemSlots)
-
+
def getFailedSystemSlotDescriptions(self):
return map(self._getFailedSlotDescription, self._failedSystemSlots)
-
+
def getUniversalActivationKey(self):
"""Returns None if no universal activation key was used."""
return self._universalActivationKey
-
+
def hasBaseAndUpdates(self):
"""Returns True if the system was subscribed to at least one channel
and was given any type of system slot so it will get updates. In other
- words, returns True if the system will be getting at least basic
+ words, returns True if the system will be getting at least basic
updates.
-
+
"""
- # If it was subscribed to at least one channel, that must include a
+ # If it was subscribed to at least one channel, that must include a
# base channel.
return len(self._channels) > 0 and len(self._systemSlots) > 0
-
+
def _getFailedSlotDescription(self, slot):
if slot in ['virtualization_host', 'virtualization_host_platform']:
return rhnreg_constants.VIRT + " " + rhnreg_constants.VIRT_FAILED
@@ -324,13 +324,13 @@ def registerSystem(username = None, password = None,
token = None, other = None):
"""Wrapper for the old xmlrpc to register a system. Activates subscriptions
if a reg num is given.
-
+
"""
auth_dict = { "profile_name" : profileName,
"os_release" : up2dateUtils.getVersion(),
"release_name" : up2dateUtils.getOSRelease(),
"architecture" : up2dateUtils.getArch() }
- # dict of other bits to send
+ # dict of other bits to send
if other:
for (key, item) in other.items():
auth_dict[key] = item
@@ -342,7 +342,7 @@ def registerSystem(username = None, password = None,
if cfg['supportsSMBIOS']:
auth_dict["smbios"] = _encode_characters(hardware.get_smbios())
-
+
s = rhnserver.RhnServer()
if packages == None:
ret = s.registration.new_system(auth_dict)
@@ -370,50 +370,50 @@ def updateRhsmStatus():
# about a timely reply or what the result might be, we just want
# the method to run. So we can safely ignore this.
pass
-
-
+
+
def getAvailableChannels(username, password):
s = rhnserver.RhnServer()
server_arch = up2dateUtils.getArch()
server_version = up2dateUtils.getVersion()
server_release = up2dateUtils.getRelease()
-
+
availableChannels = None
try:
availableChannels = s.registration.available_eus_channels(
username, password,
- server_arch, server_version,
+ server_arch, server_version,
server_release)
except xmlrpclib.Fault, f:
if f.faultCode == 99:
raise up2dateErrors.DelayError(f.faultString), None, sys.exc_info()[2]
else:
raise
-
+
return availableChannels
-
+
def registerSystem2(username = None, password = None,
profileName = None, packages = None,
activationKey = None, other = {}):
"""Uses the new xmlrpcs to register a system. Returns a dict instead of just
system id.
-
+
The main differences between this and registerSystem and that this doesn't
- do activation and does child channel subscriptions if possible. See the
+ do activation and does child channel subscriptions if possible. See the
documentation for the xmlrpc handlers in backend for more detail.
-
+
If nothing is going to be in other, it can be {} or None.
New in RHEL 5.
-
+
"""
if other is None:
other = {}
-
+
if activationKey:
assert username is None
assert password is None
@@ -423,9 +423,9 @@ def registerSystem2(username = None, password = None,
assert password is not None
assert activationKey is None
for key in other.keys():
- assert key in ['registration_number',
- 'org_id',
- 'virt_uuid',
+ assert key in ['registration_number',
+ 'org_id',
+ 'virt_uuid',
'virt_type',
'channel']
@@ -433,7 +433,7 @@ def registerSystem2(username = None, password = None,
other["smbios"] = _encode_characters(hardware.get_smbios())
s = rhnserver.RhnServer()
-
+
if activationKey:
info = s.registration.new_system_activation_key(profileName,
up2dateUtils.getOSRelease(),
@@ -450,9 +450,9 @@ def registerSystem2(username = None, password = None,
password,
other)
log.log_debug("Returned:\n%s" % info)
- result = RegistrationResult(info['system_id'],
- info['channels'], info['failed_channels'],
- info['system_slots'], info['failed_system_slots'],
+ result = RegistrationResult(info['system_id'],
+ info['channels'], info['failed_channels'],
+ info['system_slots'], info['failed_system_slots'],
info['universal_activation_key'],
rawDict=info)
return result
@@ -478,7 +478,7 @@ def sendHardware(systemId, hardwareList):
if not s.capabilities.hasCapability('ipv6', 1):
hardwareList = map(remove_ip6addr, hardwareList)
s.registration.add_hw_profile(systemId, _encode_characters(hardwareList))
-
+
def sendPackages(systemId, packageList):
s = rhnserver.RhnServer()
if not s.capabilities.hasCapability('xmlrpc.packages.extended_profile', 2):
@@ -495,9 +495,9 @@ def listPackages(systemId):
print s.registration.list_packages,systemId()
def makeNiceServerUrl(server):
- """Raises up2dateErrors.InvalidProtocolError if the server url has a
+ """Raises up2dateErrors.InvalidProtocolError if the server url has a
protocol specified and it's not http or https.
-
+
"""
protocol, host, path, parameters, query, fragmentIdentifier = \
urlparse.urlparse(server) if protocol is None or protocol == '':
@@ -511,7 +511,7 @@ def makeNiceServerUrl(server):
"http are allowed.")
if path is None or path == '' or path == '/':
path = '/XMLRPC'
- server = urlparse.urlunparse((protocol, host, path, parameters, query,
+ server = urlparse.urlunparse((protocol, host, path, parameters, query,
fragmentIdentifier))
# TODO Raise an exception if url isn't valid
return server
@@ -519,9 +519,9 @@ def makeNiceServerUrl(server):
def getServerType(serverUrl=None):
"""Returns 'hosted' if the url points to a known hosted server. Otherwise
returns 'satellite'.
-
+
If serverUrl is not specified, it is read from the config entry 'serverURL'.
-
+
"""
if serverUrl is None:
serverUrl = config.getServerlURL()[0]
@@ -529,9 +529,9 @@ def getServerType(serverUrl=None):
serverUrl = makeNiceServerUrl(serverUrl)
protocol, host, path, parameters, query, fragmentIdentifier = \
urlparse.urlparse(serverUrl)
-
+
hosted_whitelist = cfg['hostedWhitelist']
-
+
if host in ['xmlrpc.rhn.redhat.com', 'rhn.redhat.com'] or \
hosted_whitelist is not None and host in hosted_whitelist:
return 'hosted'
@@ -546,21 +546,21 @@ def updatePackages(systemId):
class ActivationResult:
ACTIVATED_NOW = 0
ALREADY_USED = 1
-
+
def __init__(self, status, registrationNumber, channels={}, systemSlots={}):
- """channels and systemSlots are dicts where the key/value pairs are
+ """channels and systemSlots are dicts where the key/value pairs are
label (string) / quantity (int).
-
+
"""
self._status = status
# TODO Validate reg num
self._regNum = registrationNumber
self._channels = channels
self._systemSlots = systemSlots
-
+
def getStatus(self):
return self._status
-
+
def getRegistrationNumber(self):
return self._regNum
@@ -625,23 +625,23 @@ def _activate_hardware(login, password):
def activateHardwareInfo(username, password, hardwareInfo, orgId=None):
"""Tries to activate an entitlement linked to the hardware info that we
read from the bios.
-
+
Returns an ActivationResult.
Can raise:
Invalid number.
Hardware info is not entitling.
Communication errors, etc
-
+
"""
## import pprint
## pprint.pprint(hardwareInfo)
-
+
other = {}
if orgId:
other = {'org_id': orgId}
-
+
server = rhnserver.RhnServer()
- result = server.registration.activate_hardware_info(username, password,
+ result = server.registration.activate_hardware_info(username, password,
hardwareInfo, other)
statusCode = result['status_code']
regNum = result['registration_number']
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnregGui.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnregGui.py
index d3059fd..edf8c44 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -30,24 +30,24 @@
# this is a module containing classes for the registration related windows in
# gui.py. The code is split up so we can reuse it in the firstboot modules
"""
-Explanation of the RHN registration gui and how it is used from both
+Explanation of the RHN registration gui and how it is used from both
rhn_register and firstboot (from alikins):
-Most of the "work" happens in rhnregGui.py. Thats where the
+Most of the "work" happens in rhnregGui.py. Thats where the
logic for the screens is.
-gui.py has Gui which is the big monster class (using druid) that makes up the
-main gui wizard for up2date/rhn_register. Gui implements showing the pages for
-up2date/rhn_register. For up2date/rhnreg, it has methods that load the classes
-from rhnregGui (by multiple inheritance...), but it's not too bad, it's all
-mixin stuff, nothing wacky, no overridden methods or anything.
-firstboot/* does more or less the same thing, but with a different style of
-wrapper just to present the firstboot style api's. (Each "page" in firstboot is
+gui.py has Gui which is the big monster class (using druid) that makes up the
+main gui wizard for up2date/rhn_register. Gui implements showing the pages for
+up2date/rhn_register. For up2date/rhnreg, it has methods that load the classes
+from rhnregGui (by multiple inheritance...), but it's not too bad, it's all
+mixin stuff, nothing wacky, no overridden methods or anything.
+firstboot/* does more or less the same thing, but with a different style of
+wrapper just to present the firstboot style api's. (Each "page" in firstboot is
a module with a class that inherits FirstBootGuiWindow.)
"""
import urlparse
import gtk
-# Need to import gtk.glade to make this file work alone even though we always
-# access it as gtk.glade. Not sure why. Maybe gtk's got weird hackish stuff
+# Need to import gtk.glade to make this file work alone even though we always
+# access it as gtk.glade. Not sure why. Maybe gtk's got weird hackish stuff
# going on?
import gtk.glade
import gobject
@@ -88,7 +88,7 @@ hw_activation_code = None
serverType = None
chosen_channel = None
-# _hasBaseChannelAndUpdates gets set by the code in create profile which
+# _hasBaseChannelAndUpdates gets set by the code in create profile which
# registers the system and used by hasBaseChannelAndUpdates()
_hasBaseChannelAndUpdates = False
_autoActivatedNumbers = False # used by autoActivateNumbersOnce()
@@ -99,7 +99,7 @@ class ReviewLog:
self._boldTag = self._text.create_tag(weightp0)
def prependBoldText(self, text):
- """Adds a blob of bolded text to the beggining specified section. Adds a \
newline + """Adds a blob of bolded text to the beggining specified section. \
Adds a newline after the text.
"""
self.prependText(text)
@@ -110,9 +110,9 @@ class ReviewLog:
self._text.apply_tag(self._boldTag, startOfText, endOfText)
def addBoldText(self, text):
- """Adds a blob of bolded text to the specified section. Adds a newline
+ """Adds a blob of bolded text to the specified section. Adds a newline
after the text.
-
+
"""
self.addText(text)
# Make it bold
@@ -131,17 +131,17 @@ class ReviewLog:
def addText(self, text):
"""Adds a blob of text to the specified section. Adds a newline after
the text.
-
+
"""
end = self._text.get_end_iter()
self._text.insert(end, text + '\n')
-
+
def addBulletedText(self, text):
self.addText(u'\u2022' + ' ' + text)
-
+
def getTextBuffer(self):
return self._text
-
+
def usedUniversalActivationKey(self, keyName):
self.addBoldText(_("Notice"))
keys = ', '.join(keyName)
@@ -189,7 +189,7 @@ class ReviewLog:
for channel in failedChannels:
self.addBulletedText(channel)
self.addText('') # adds newline
-
+
def systemSlots(self, slots, failedSlots):
self.addBoldText(rhnreg_constants.SLOTS_TITLE)
self.addText(rhnreg_constants.OK_SLOTS)
@@ -203,15 +203,15 @@ class ReviewLog:
for slot in failedSlots:
self.addBulletedText(slot)
self.addText('') # adds newline
-
+
reviewLog = ReviewLog()
class StartPage:
"""There is a section of this page which asks if the user wants to register,
- which will only be shown in firstboot. This is specified by the arg to the
+ which will only be shown in firstboot. This is specified by the arg to the
constructor.
-
+
"""
def __init__(self, firstbootúlse):
self.startXml = gtk.glade.XML(gladefile, "startWindowVbox",
@@ -224,24 +224,24 @@ class StartPage:
startWindowVbox = self.startXml.get_widget("startWindowVbox")
chooseToRegisterVbox = self.startXml.get_widget('chooseToRegisterVbox')
startWindowVbox.remove(chooseToRegisterVbox)
-
+
def startPageVbox(self):
return self.startXml.get_widget("startWindowVbox")
-
+
def startPageWhyRegisterButton(self, button):
WhyRegisterDialog()
def startPageRegisterNow(self):
- """Returns True if the user has selected to register now. False if
+ """Returns True if the user has selected to register now. False if
they've selected to register later.
-
+
"""
return self.registerNowButton.get_active()
class ChooseServerPage:
def __init__(self):
- self.chooseServerXml = gtk.glade.XML(gladefile,
+ self.chooseServerXml = gtk.glade.XML(gladefile,
"chooseServerWindowVbox",
domain="rhn-client-tools")
self.chooseServerXml.signal_autoconnect ({
@@ -251,28 +251,28 @@ class ChooseServerPage:
self.hostedButton = self.chooseServerXml.get_widget('hostedButton')
self.satelliteButton = self.chooseServerXml.get_widget('satelliteButton')
self.customServerEntry = \
self.chooseServerXml.get_widget('satelliteServerEntry')
-
+
self.customServerBox = self.chooseServerXml.get_widget('customServerTable')
def chooseServerPagePrepare(self):
self.server = config.getServerlURL()[0]
-
+
log.log_debug("server is %s" % self.server)
if "rhn.redhat.com/XMLRPC" in self.server:
self.hostedButton.set_active(True)
else:
self.satelliteButton.set_active(True)
self.customServerEntry.set_text(self.server)
-
+
def chooseServerPageVbox(self):
return self.chooseServerXml.get_widget("chooseServerWindowVbox")
-
+
def onSatelliteButtonToggled(self, entry):
is_sensitive = False
if self.satelliteButton.get_active():
is_sensitive = True
self.customServerBox.set_sensitive(is_sensitive)
-
+
def showNetworkConfigDialog(self, button):
NetworkConfigDialog()
@@ -290,11 +290,11 @@ class ChooseServerPage:
return False
else:
return True
-
+
def _chooseServerPageApply(self):
"""Returns True if an error happened so we shouldn't advance to the next
screen, but it was already dealt with. False if everything is peachy.
- Can probably raise all sorts of exceptions, but I wish it only raised
+ Can probably raise all sorts of exceptions, but I wish it only raised
SSLCertificateVerifyFailedError.
"""
global serverType
@@ -316,11 +316,11 @@ class ChooseServerPage:
if customServer != self.server:
config.setServerURL(customServer)
if not cfg['sslCACert']:
- up2dateConfig.set('sslCACert',
+ up2dateConfig.set('sslCACert',
'/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT')
serverType = rhnreg.getServerType()
-
+
NEED_SERVER_MESSAGE = _("You will not be able to successfully register "
"this system without contacting a Red Hat Network \
server.")
@@ -389,7 +389,7 @@ class LoginPage:
"LoginPage must be derived from, by a class that implements \
goToPageAfterLogin." self.loginXml = gtk.glade.XML(gladefile,
"initialLoginWindowVbox", \
domain="rhn-client-tools")
- self.loginXml.signal_autoconnect ({
+ self.loginXml.signal_autoconnect ({
"onLoginUserEntryActivate" : self.loginPageAccountInfoActivate,
"onLoginPasswordEntryActivate" : self.loginPageAccountInfoActivate,
})
@@ -399,7 +399,7 @@ class LoginPage:
def loginPagePrepare(self):
"""Changes the screen slightly depending on whether hosted or satellite
is being used.
-
+
"""
assert serverType in ['hosted', 'satellite']
instructionsLabel = self.loginXml.get_widget('instructionsLabel')
@@ -422,17 +422,17 @@ class LoginPage:
forgotInfoHosted.show()
tipIconSatellite.hide()
tipIconHosted.show()
-
+
def loginPageVbox(self):
return self.loginXml.get_widget("initialLoginWindowVbox")
def loginPageAccountInfoActivate(self, entry):
"""Handles activation (hitting enter) in the username and password fields.
-
+
If a password was entered or the focus is already in the password field,
- tries to advance the screen if possible. If focus in elsewhere and
+ tries to advance the screen if possible. If focus in elsewhere and
nothing is in the password field, puts the focus in there.
-
+
"""
passwordEntry = self.loginXml.get_widget("loginPasswordEntry")
if entry == passwordEntry or len(passwordEntry.get_text()) > 0:
@@ -441,9 +441,9 @@ class LoginPage:
self.onLoginPageNext(None, None)
else:
passwordEntry.grab_focus()
-
+
def loginPageVerify(self):
- """Returns True if there's an error with the user input, False
+ """Returns True if there's an error with the user input, False
otherwise.
"""
self.loginPw = self.loginXml.get_widget("loginPasswordEntry")
@@ -487,13 +487,13 @@ class LoginPage:
print e.errmsg
self.fatalError(_("There was an error communicating with the \
registration server. The message was:\n") + e.errmsg) return True # fatalError in \
firstboot will return to here
-
+
return False
def loginPageApply(self):
- """Returns True if an error happened (the user will have gotten an error
+ """Returns True if an error happened (the user will have gotten an error
message) or False if everything was ok.
-
+
"""
status = callAndFilterExceptions(
self._loginPageApply,
@@ -504,7 +504,7 @@ class LoginPage:
return False
else:
return True
-
+
def _loginPageApply(self):
"""Returns False if everything's ok, True if there was a problem."""
try:
@@ -525,10 +525,10 @@ class LoginPage:
print e.errmsg
self.fatalError(_("There was an error communicating with the \
registration server. The message was:\n") + e.errmsg) return True # fatalError in \
firstboot will return to here
-
+
setArrowCursor()
return False
-
+
class ReviewSubscriptionPage:
def __init__(self):
@@ -537,26 +537,26 @@ class ReviewSubscriptionPage:
domain="rhn-client-tools")
self.reviewTextView = \
self.reviewSubscriptionXml.get_widget("reviewTextView")
-
+
def reviewSubscriptionPagePrepare(self):
self.reviewTextView.set_buffer(reviewLog.getTextBuffer())
-
+
def reviewSubscriptionPageVbox(self):
return self.reviewSubscriptionXml.get_widget("reviewSubscriptionWindowVbox")
class ConfirmAllUpdatesDialog:
def __init__(self):
- self.xml = gtk.glade.XML(gladefile, "confirmAllUpdatesDialog",
+ self.xml = gtk.glade.XML(gladefile, "confirmAllUpdatesDialog",
domain="rhn-client-tools")
self.dialog = self.xml.get_widget("confirmAllUpdatesDialog")
-
+
self.rc = self.dialog.run()
if self.rc != 1:
self.rc = 0
self.dialog.destroy()
-
+
class ChooseChannelPage:
def __init__(self):
self.chooseChannelXml = gtk.glade.XML(gladefile,
@@ -568,35 +568,35 @@ class ChooseChannelPage:
self.all_updates_button = \
self.chooseChannelXml.get_widget("all_updates_button") self.chose_all_updates = \
False self.chose_default_channel = True
-
+
def chooseChannelPageVbox(self):
return self.chooseChannelXml.get_widget("chooseChannelWindowVbox")
-
+
def channel_changed_cb(self, combobox):
self.limited_updates_button.set_active(True)
-
+
def chooseChannelPagePrepare(self):
-
+
global username, password
# The self.eus_channels was populated in chooseChannelShouldBeShown
self.channels = self.eus_channels['channels']
self.receiving_updates = self.eus_channels['receiving_updates']
-
+
list_entry = gtk.ListStore(gobject.TYPE_STRING)
self.chooseChannelList.set_model(list_entry)
cell = gtk.CellRendererText()
self.chooseChannelList.pack_start(cell, False)
-
+
self.chooseChannelList.connect('changed', self.channel_changed_cb)
-
+
self.chooseChannelList.remove_text(0)
for label, name in self.channels.items():
if label in self.receiving_updates:
self.channels[label] = name + ' *'
-
+
channel_values = self.channels.values()
channel_values.sort()
for name in channel_values:
@@ -604,9 +604,9 @@ class ChooseChannelPage:
self.chooseChannelList.set_active(0)
self.all_updates_button.set_active(True)
-
+
setArrowCursor()
-
+
def chooseChannelPageApply(self):
if self.limited_updates_button.get_active():
global chosen_channel
@@ -620,11 +620,11 @@ class ChooseChannelPage:
self.chose_default_channel = False
else:
self.chose_default_channel = True
-
+
return True
else:
self.chose_all_updates = True
-
+
def chooseChannelShouldBeShown(self):
'''
Returns True if the choose channel window should be shown, else
@@ -656,7 +656,7 @@ class CreateProfilePage:
self.activationNoPackages = None # used by fb
self.noChannels = None # used by fb
self.serviceNotEnabled = None # used by fb
-
+
def createProfilePagePrepare(self):
callAndFilterExceptions(
self._createProfilePagePrepare,
@@ -666,16 +666,16 @@ class CreateProfilePage:
def _createProfilePagePrepare(self):
# There was a comment by these calls that said "part of fix for #144704"
- # I don't understand how the code fixed that bug. It might be that
- # they had originally been run at screen initialization which would
+ # I don't understand how the code fixed that bug. It might be that
+ # they had originally been run at screen initialization which would
# break stuff and it was changed to only run them when the user got
# to this screen.
self.getHardware()
self.populateProfile()
-
+
def createProfilePageVbox(self):
return self.createProfileXml.get_widget("createProfileWindowVbox")
-
+
# we cant do this on module load because there might be a valid interface
# but zero connectivity
def getHardware(self):
@@ -683,7 +683,7 @@ class CreateProfilePage:
self.hardware = hardware.Hardware()
except:
print _("Error running hardware profile")
-
+
def populateProfile(self):
try:
if not self.initProfile:
@@ -698,7 +698,7 @@ class CreateProfilePage:
ipaddr = hw.get('ipaddr')
ip6addr = hw.get('ip6addr')
# the check against "unknown" is a bit lame, but it's
- # the minimal change to fix #144704
+ # the minimal change to fix #144704
if hostname and (hostname != "unknown"):
profileName = hostname
elif ipaddr:
@@ -714,17 +714,17 @@ class CreateProfilePage:
except:
unexpectedError(_("There was an error while populating the profile."), \
sys.exc_info()) setArrowCursor()
-
+
def createProfilePageShowHardwareDialog(self, button):
HardwareDialog()
-
+
def createProfilePageShowPackageDialog(self, button):
PackageDialog()
-
+
def createProfilePageVerify(self):
- """Returns True if an error happened (the user will have gotten an error
+ """Returns True if an error happened (the user will have gotten an error
message) or False if everything was ok.
-
+
"""
systemNameEntry = self.createProfileXml.get_widget("systemNameEntry")
sendHardwareButton = self.createProfileXml.get_widget("sendHardwareButton")
@@ -738,11 +738,11 @@ class CreateProfilePage:
if not self.sendPackages:
self.activationNoPackages = 1
return False
-
+
def createProfilePageApply(self):
- """Returns True if an error happened (the user will have gotten an error
+ """Returns True if an error happened (the user will have gotten an error
message) or False if everything was ok.
-
+
"""
status = callAndFilterExceptions(
self._createProfilePageApply,
@@ -753,7 +753,7 @@ class CreateProfilePage:
return False
else:
return True
-
+
def _createProfilePageApply(self):
"""Returns False if everything's ok or True if something's wrong."""
setBusyCursor()
@@ -774,9 +774,9 @@ class CreateProfilePage:
other['virt_type'] = virt_type
profileName = \
self.createProfileXml.get_widget("systemNameEntry").get_text()
-
+
pwin.setProgress(1, 6)
-
+
pwin.setStatusLabel(_("Registering System"))
try:
reg_info = rhnreg.registerSystem2(username, password, profileName, \
other=other) @@ -787,7 +787,7 @@ class CreateProfilePage:
reviewLog.usedUniversalActivationKey(
reg_info.getUniversalActivationKey())
reviewLog.channels(reg_info.getChannels(), reg_info.getFailedChannels())
- reviewLog.systemSlots(reg_info.getSystemSlotDescriptions(),
+ reviewLog.systemSlots(reg_info.getSystemSlotDescriptions(),
reg_info.getFailedSystemSlotDescriptions())
except up2dateErrors.CommunicationError, e:
pwin.hide()
@@ -816,7 +816,7 @@ class CreateProfilePage:
log.log_exception(*sys.exc_info())
return True
pwin.setProgress(2,6)
-
+
# write the system id out.
if self.systemId:
if not rhnreg.writeSystemId(self.systemId):
@@ -850,7 +850,7 @@ class CreateProfilePage:
import time
time.sleep(1)
pwin.setProgress(4, 6)
-
+
if self.sendPackages:
getArch = 0
if cfg['supportsExtendedPackageProfile']:
@@ -891,7 +891,7 @@ class CreateProfilePage:
except up2dateErrors.RhnServerException, e:
self.fatalError(str(e), wrap=0)
return True # fatalError in firstboot will return to here
-
+
if li:
# see if we have any active channels
if li['X-RHN-Auth-Channels'] == []:
@@ -911,11 +911,11 @@ class CreateProfilePage:
rhnreg.spawnRhnCheckForUI()
pwin.setProgress(6,6)
pwin.hide()
-
+
setArrowCursor()
return False
-
-
+
+
def __updateContactInfo(self, newAccount, productInfo, uname, password, pwin):
try:
if newAccount:
@@ -929,8 +929,8 @@ class CreateProfilePage:
pwin.hide()
errorWindow(_("Problem registering personal information"))
return True
- return False
-
+ return False
+
def __registerProduct(self, newAccount, productInfo, pwin):
try:
if newAccount:
@@ -954,55 +954,55 @@ class ProvideCertificatePage:
self.provideCertificateXml = gtk.glade.XML(gladefile,
"provideCertificateWindowVbox",
domain="rhn-client-tools")
-
+
self.orig_cert_label_template = \
self.provideCertificateXml.get_widget("SecurityCertLabel").get_text()
def provideCertificatePageVbox(self):
return self.provideCertificateXml.get_widget("provideCertificateWindowVbox")
def setUrlInWidget(self):
- """
- sets the security cert label's server url at runtime
+ """
+ sets the security cert label's server url at runtime
"""
securityCertlabel = \
self.provideCertificateXml.get_widget("SecurityCertLabel")
securityCertlabel.set_text(self.orig_cert_label_template % \
config.getServerlURL()[0] )
def provideCertificatePageApply(self):
- """If the 'I have a cert' radio button is selected, this function will
- copy the cert to /usr/share/rhn. If we're using hosted it will name it
- RHNS-CA-CERT otherwise it will name it RHN-ORG-TRUSTED-SSL-CERT. It will
- change the owner to root and the perms to 644. If a file with
- that name already exists it will add a '.save<lowest available integer>' to
- the end of the old file's name. It will update the config file to point
+ """If the 'I have a cert' radio button is selected, this function will
+ copy the cert to /usr/share/rhn. If we're using hosted it will name it
+ RHNS-CA-CERT otherwise it will name it RHN-ORG-TRUSTED-SSL-CERT. It will
+ change the owner to root and the perms to 644. If a file with
+ that name already exists it will add a '.save<lowest available integer>' to
+ the end of the old file's name. It will update the config file to point
to the new cert.
Returns:
0- cert was installed
1- the user doesn't want to provide a cert right now
2- an error occurred and the user was notified
- 3- the cert was installed ok, but the server doesn't support needed
+ 3- the cert was installed ok, but the server doesn't support needed
calls
Doesn't raise any exceptions.
"""
status = callAndFilterExceptions(
self._provideCertificatePageApply,
- [],
+ [],
_("There was an error while installing the certificate.")
)
if status == 0 or status == 1 or status == 3:
return status
else:
return 2
-
+
def _provideCertificatePageApply(self):
- """Does what the comment for provideCertificatePageApply says, but might
+ """Does what the comment for provideCertificatePageApply says, but might
raise various exceptions.
-
+
"""
CERT_INSTALLED = 0
NOT_INSTALLING_CERT = 1
ERROR_WAS_HANDLED = 2
SERVER_TOO_OLD = 3
-
+
assert serverType in ['hosted', 'satellite']
try:
provideCertButton = \
self.provideCertificateXml.get_widget("provideCertificateButton") @@ -1043,13 \
+1043,13 @@ class ProvideCertificatePage:
return ERROR_WAS_HANDLED
except OpenSSL.SSL.Error:
- # TODO Modify rhnlib to raise a unique exception for the not a
+ # TODO Modify rhnlib to raise a unique exception for the not a
# cert file case.
errorWindow(_("There was an SSL error. This could be because the \
file you picked was not a certificate file.")) return ERROR_WAS_HANDLED
return CERT_INSTALLED
-
+
except IOError, e:
# TODO Provide better messages
message = _("Something went wrong while installing the new \
certificate:\n") @@ -1061,7 +1061,7 @@ class ProvideCertificatePage:
class FinishPage:
"""The finish screen. This can show two different versions: successful and
unsuccessful.
-
+
"""
def __init__(self):
self.failedFinishXml = gtk.glade.XML(gladefile,
@@ -1080,10 +1080,10 @@ class FinishPage:
self.successfulFinishXml.get_widget("successfulFinishWindowVbox")
# Put one in now (either one) to make the prepare code simpler
self.finishContainerVbox.pack_start(self.failedFinishVbox)
-
+
def finishPageVbox(self):
return self.finishContainerVbox
-
+
def finishPagePrepare(self):
containerChildren = self.finishContainerVbox.get_children()
assert len(containerChildren) == 1
@@ -1098,18 +1098,18 @@ class AlreadyRegisteredDialog:
def __init__(self):
"""Returns when dialog closes. Dialog.rc will be set to 1 if the user
clicked continue, or 0 if they clicked cancel or close the dialog.
-
+
"""
- self.xml = gtk.glade.XML(gladefile, "alreadyRegisteredDialog",
+ self.xml = gtk.glade.XML(gladefile, "alreadyRegisteredDialog",
domain="rhn-client-tools")
self.dialog = self.xml.get_widget("alreadyRegisteredDialog")
-
+
server = _('unknown')
oldUsername = _('unknown')
systemId = _('unknown')
try:
# If the serverURL config value is a list, we have no way of knowing
- # for sure which one the machine registered against,
+ # for sure which one the machine registered against,
# so default to the
# first element.
server = config.getServerlURL()[0]
@@ -1121,11 +1121,11 @@ class AlreadyRegisteredDialog:
systemId = systemIdXml[0][0]['system_id']
except:
pass
-
+
self.xml.get_widget('serverUrlLabel').set_label(server)
self.xml.get_widget('usernameLabel').set_label(oldUsername)
self.xml.get_widget('systemIdLabel').set_label(systemId)
-
+
self.rc = self.dialog.run()
if self.rc != 1:
self.rc = 0
@@ -1152,15 +1152,15 @@ class AlreadyRegisteredSubscriptionManagerDialog:
class ConfirmQuitDialog:
def __init__(self):
"""Returns when dialog closes. Dialog.rc will be set to 0 if the user
- clicked "take me back" or closed the dialog, or 1 if they clicked "i'll
+ clicked "take me back" or closed the dialog, or 1 if they clicked "i'll
register later". I've they clicked I'll register later, the remind file
will be written to disk.
-
+
"""
- self.xml = gtk.glade.XML(gladefile, "confirmQuitDialog",
+ self.xml = gtk.glade.XML(gladefile, "confirmQuitDialog",
domain="rhn-client-tools")
self.dialog = self.xml.get_widget("confirmQuitDialog")
-
+
self.rc = self.dialog.run()
if self.rc == gtk.RESPONSE_NONE:
self.rc = 0
@@ -1181,30 +1181,30 @@ class WhyRegisterDialog:
self.whyRegisterXml.signal_autoconnect({
"onBackToRegistrationButtonClicked" : self.finish,
})
-
+
def finish(self, button):
self.dlg.hide()
self.rc = 1 # What does this do? Is it needed?
-
+
class HardwareDialog:
def __init__(self):
self.hwXml = gtk.glade.XML(
gladefile,
"hardwareDialog", domain="rhn-client-tools")
self.dlg = self.hwXml.get_widget("hardwareDialog")
-
+
self.hwXml.get_widget("okButton").connect("clicked", self.finish)
callAndFilterExceptions(
self.populateHardware,
- [],
+ [],
_("There was an error getting the list of hardware.")
)
def populateHardware(self):
# Read all hardware in
self.hardware = hardware.Hardware()
-
+
for hw in self.hardware:
if hw['class'] == 'CPU':
label = self.hwXml.get_widget("cpuLabel")
@@ -1234,13 +1234,13 @@ class HardwareDialog:
try:
distversion = up2dateUtils.getVersion()
except up2dateErrors.RpmError, e:
- # TODO Do something similar during registration if the same
+ # TODO Do something similar during registration if the same
# situation can happen. Even better, factor out the code to get the
# hardware.
errorWindow(e.errmsg)
distversion = 'unknown'
label.set_text(distversion)
-
+
def finish(self, button):
self.dlg.hide()
self.rc = 1
@@ -1252,12 +1252,12 @@ class PackageDialog:
gladefile,
"packageDialog", domain="rhn-client-tools")
self.dlg = self.swXml.get_widget("packageDialog")
-
+
self.swXml.get_widget("okButton").connect("clicked", self.finish)
-
+
callAndFilterExceptions(
self.populateDialog,
- [],
+ [],
_("There was an error building the list of packages.")
)
@@ -1270,7 +1270,7 @@ class PackageDialog:
self.packageStore.append((nvr, arch))
self.packageTreeView = self.swXml.get_widget("packageTreeView")
self.packageTreeView.set_model(self.packageStore)
-
+
self.packageTreeView.set_rules_hint(True)
col = gtk.TreeViewColumn(_("Package"), gtk.CellRendererText(), text=0)
@@ -1289,7 +1289,7 @@ class PackageDialog:
packageDialogPackages = pkgUtils.getInstalledPackageList(progressCallback = \
pwin.setProgress, getArch=1) pwin.hide()
return packageDialogPackages
-
+
def finish(self, button):
self.dlg.hide()
self.rc = 1
@@ -1297,14 +1297,14 @@ class PackageDialog:
class NetworkConfigDialog:
"""This is the dialog that allows setting http proxy settings.
-
- It uses the instant apply paradigm or whatever you wanna call it that the
- gnome HIG recommends. Whenever a toggle button is flipped or a text entry
+
+ It uses the instant apply paradigm or whatever you wanna call it that the
+ gnome HIG recommends. Whenever a toggle button is flipped or a text entry
changed, the new setting will be saved.
-
+
"""
def __init__(self):
- self.xml = gtk.glade.XML(gladefile, "networkConfigDialog",
+ self.xml = gtk.glade.XML(gladefile, "networkConfigDialog",
domain="rhn-client-tools")
# Get widgets we'll need to access
self.dlg = self.xml.get_widget("networkConfigDialog")
@@ -1320,8 +1320,8 @@ class NetworkConfigDialog:
"configuration. Make sure that\nyou "
"have read access to /etc/sysconfig/rhn."),
self.dlg)
- # Need to load values before connecting signals because when the dialog
- # starts up it seems to trigger the signals which overwrites the config
+ # Need to load values before connecting signals because when the dialog
+ # starts up it seems to trigger the signals which overwrites the config
# with the blank values.
self.setInitialValues()
self.enableProxyButton.connect("toggled", self.enableAction)
@@ -1333,7 +1333,7 @@ class NetworkConfigDialog:
self.proxyPasswordEntry.connect("focus-out-event", self.writeValues)
self.xml.get_widget("closeButton").connect("clicked", self.close)
self.dlg.show()
-
+
def setInitialValues(self):
self.xml.get_widget("enableProxyButton").set_active(self.cfg["enableProxy"])
self.enableAction(self.xml.get_widget("enableProxyButton"))
@@ -1342,7 +1342,7 @@ class NetworkConfigDialog:
self.enableAction(self.xml.get_widget("enableProxyAuthButton"))
self.xml.get_widget("proxyUserEntry").set_text(str(self.cfg["proxyUser"]))
self.xml.get_widget("proxyPasswordEntry").set_text(str(self.cfg["proxyPassword"]))
-
+
def writeValues(self, widget=None, dummy=None):
self.cfg.set("enableProxy",
int(self.xml.get_widget("enableProxyButton").get_active()))
@@ -1361,10 +1361,10 @@ class NetworkConfigDialog:
"There was an error saving your configuration. "\
"Make sure that\nyou own %s.") % self.cfg.fileName,
self.dlg)
-
+
def close(self, button):
self.dlg.hide()
-
+
def enableAction(self, button):
if button.get_name() == "enableProxyButton":
self.xml.get_widget("proxyEntry").set_sensitive(button.get_active())
@@ -1381,10 +1381,10 @@ def errorWindow(message):
def unexpectedError(message, exc_info=None):
"""Shows an error dialog with the message and logs that an error happened.
-
+
This function is designed to be used in an except block like so:
unexpectedError(_("Your error here."), sys.exc_info())
-
+
"""
setArrowCursor()
logFile = cfg['logFile'] or '/var/log/up2date'
@@ -1400,16 +1400,16 @@ def unexpectedError(message, exc_info=None):
else:
log.log_me("An unexpected error happened, but exc_info wasn't provided.")
-def callAndFilterExceptions(function, allowedExceptions,
+def callAndFilterExceptions(function, allowedExceptions,
disallowedExceptionMessage, errorHandler=unexpectedError):
"""Calls function and limits the exceptions that can be raised to those in
- the list provided and SystemExit. If an exception is raised which isn't
- allowed, errorHandler will be called and then None will be returned.
- errorHandler defaults to the unexpectedError function and will be passed
- disallowedExceptionMessage. If it is overridden, the function provided must
- take a string and a tuple (see below for details). If no exceptions are
+ the list provided and SystemExit. If an exception is raised which isn't
+ allowed, errorHandler will be called and then None will be returned.
+ errorHandler defaults to the unexpectedError function and will be passed
+ disallowedExceptionMessage. If it is overridden, the function provided must
+ take a string and a tuple (see below for details). If no exceptions are
raised, functions's return value is returned.
-
+
I need this function because if some of the functions in the Pages raise
unexpected exceptions, the druid might advance when it shouldn't or go to
the wrong page. I think it's shorter and more readable to factor this out
@@ -1424,7 +1424,7 @@ def callAndFilterExceptions(function, allowedExceptions,
if exceptionType in allowedExceptions:
raise
else:
- errorHandler(disallowedExceptionMessage,
+ errorHandler(disallowedExceptionMessage,
(exceptionType, exception, stackTrace))
def try_to_activate_hardware():
@@ -1438,11 +1438,11 @@ def try_to_activate_hardware():
setArrowCursor()
def hasBaseChannelAndUpdates():
- """Returns a bool indicating whether the system has registered, subscribed
+ """Returns a bool indicating whether the system has registered, subscribed
to a base channel, and has at least update entitlements.
- Uses information from the most recent time the create profile screen was run
+ Uses information from the most recent time the create profile screen was run
through.
-
+
"""
global _hasBaseChannelAndUpdates
return _hasBaseChannelAndUpdates
@@ -1451,13 +1451,13 @@ def hasBaseChannelAndUpdates():
def setBusyCursor():
"""Dummy function that will be overidden by rhn_register's standalone gui
and firstboot in different ways.
-
+
"""
pass
def setArrowCursor():
"""Dummy function that will be overidden by rhn_register's standalone gui
and firstboot in different ways.
-
+
"""
pass
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnreg_constants.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index a078568..90bb2c3 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -17,11 +17,11 @@ COPYRIGHT_TEXT = _(u"Copyright © 2006--2010 Red Hat, \
Inc. All rights res CONNECT_WINDOW = _("Attempting to contact the Red Hat \
Network server.") CONNECT_WINDOW_TEXT = _("We are attempting to contact the Red \
Hat " "Network server at %s.")
-CONNECT_WINDOW_TEXT2 = _("A proxy was specified at %s.")
+CONNECT_WINDOW_TEXT2 = _("A proxy was specified at %s.")
# Start Window
START_REGISTER_WINDOW = _("Registering for software updates")
-START_REGISTER_TEXT = _("This assistant will guide you through "
+START_REGISTER_TEXT = _("This assistant will guide you through "
"connecting your system to "
"Red Hat Network (RHN) to receive software "
"updates, including "
@@ -34,7 +34,7 @@ START_REGISTER_TEXT = _("This assistant will guide you through "
"or Proxy (optional)\n\n")
# Why Register Window
-WHY_REGISTER = _("Why Should I Connect to RHN? ...")
+WHY_REGISTER = _("Why Should I Connect to RHN? ...")
WHY_REGISTER_WINDOW = _("Why Register")
WHY_REGISTER_TEXT = _("Connecting your system to Red Hat Network allows you to \
take full "
"advantage of the benefits of a paid subscription, \
including:") @@ -114,7 +114,7 @@ PACKAGES_WINDOW_PKGLIST = _("Building Package List")
# Product Window
HOSTED_LOGIN_PROMPT = _("Please enter your login information for Red "
"Hat Network (http://rhn.redhat.com/):\n\n")
-HOSTED_LOGIN_TIP = _("Tip: Forgot your login or password? "
+HOSTED_LOGIN_TIP = _("Tip: Forgot your login or password? "
"Visit: https://rhn.redhat.com/rhn/sales/LoginInfo.do")
EMAIL = _("*Email Address:")
@@ -220,7 +220,7 @@ MANAGEMENT = _("Management module: automatic \
updates, systems "
"grouping, systems permissions, system package \
profiling") PROVISIONING = _("Provisioning module: bare-metal \
provisioning, existing state provisioning, " "rollbacks, configuration management")
-MONITORING = _("Monitoring module: pre-defined and custom system "
+MONITORING = _("Monitoring module: pre-defined and custom system "
"performance probes, system performance email "
"notifications, graphs of system performance")
@@ -253,11 +253,11 @@ NO_SYS_ENTITLEMENT = _("This system was unable to be \
associated with " "re-connect this system to Red Hat Network.")
ACTIVATION_KEY = _("Universal default activation key detected\n"
"A universal default activation key was detected in your \
RHN organization. "
- "What this means is that a set of properties (software \
channel subscriptions, " + "What this means is that a set \
of properties (software channel subscriptions, "
"Red Hat Network service, package installations, system \
group memberships, etc.) "
"for your system's connection to Red Hat Network "
"have been determined by the activation key rather than \
your "
- "installation number. "
+ "installation number. "
"You may also refer to the RHN Reference Guide, section \
6.4.6 for more details "
"about activation keys \
(http://rhn.redhat.com/rhn/help/reference/)\n" "Universal Default activation key: \
%s") @@ -284,7 +284,7 @@ SSL_CERT_ERROR_MSG = _("<b><span \
size=\"16000\">Incompatible Certificate
"The certificate you provided, <b>%s</b>, is not \
compatible with "
" the Red Hat Network server at <b>%s</b>. You may \
want to double-check"
" that you have provided a valid certificate file."
- " Are you sure you have provided the correct \
certificate, and that" + " Are you sure you have \
provided the correct certificate, and that"
" the certificate file has not been corrupted?\n\n"
"Please try again with a different certificate \
file.")
@@ -315,7 +315,7 @@ CHANNEL_PAGE_WARNING = _("Warning:You will not be able to limit \
this" " system to minor release that is older than"
" the recent minor release if you select this"
" option.\n")
-
+
CONFIRM_OS_WARNING = _("Your system will be subscribed to %s \n"
"base software channel. You will not be\n"
"able to move this system to an earlier release\n"
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnserver.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnserver.py
index fd1a8a1..25a0b0c 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnserver.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rhnserver.py
@@ -45,7 +45,7 @@ class _DoCallWrapper(object):
A callable object that will handle multiple levels of attributes,
and catch exceptions.
"""
-
+
def __init__(self, server, method_name):
self._server = server
self._method_name = method_name
@@ -80,7 +80,7 @@ class _DoCallWrapper(object):
raise up2dateErrors.SSLCertificateVerifyFailedError(), None, \
sys.exc_info()[2] else:
raise up2dateErrors.NetworkError(message), None, sys.exc_info()[2]
-
+
def __exception_from_fault(self, fault):
if fault.faultCode == -3:
# This username is already taken, or the password is incorrect.
@@ -156,8 +156,8 @@ class _DoCallWrapper(object):
class RhnServer(object):
- """
- An rpc server object that calls doCall for you, and catches lower
+ """
+ An rpc server object that calls doCall for you, and catches lower
level exceptions
"""
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpcServer.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpcServer.py
index aa8239d..1ad3db4 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpcServer.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpcServer.py
@@ -11,7 +11,7 @@ import urllib2
import clientCaps
import up2dateLog
-import up2dateErrors
+import up2dateErrors
import up2dateUtils
import up2dateAuth
@@ -40,7 +40,7 @@ class RetryServer(rpclib.Server):
except xmlrpclib.Fault:
raise
except httplib.BadStatusLine:
- self.log.log_me("Error: Server Unavailable. Please try later.")
+ self.log.log_me("Error: Server Unavailable. Please try later.")
stdoutMsgCallback(
_("Error: Server Unavailable. Please try later."))
sys.exit(-1)
@@ -79,18 +79,18 @@ class RetryServer(rpclib.Server):
break
return ret
-
+
def __getattr__(self, name):
# magic method dispatcher
return rpclib.xmlrpclib._Method(self._request1, name)
-
+
# uh, yeah, this could be an iterator, but we need it to work on 1.5 as well
class ServerList:
def __init__(self, serverlist=[]):
self.serverList = serverlist
self.index = 0
-
+
def server(self):
self.serverurl = self.serverList[self.index]
return self.serverurl
@@ -151,7 +151,7 @@ def getServer(refreshCallback=None):
s.addServerList(serverList)
s.add_header("X-Up2date-Version", up2dateUtils.version())
-
+
if lang:
s.setlang(lang)
@@ -191,7 +191,7 @@ def doCall(method, *args, **kwargs):
while 1:
failure = 0
- ret = None
+ ret = None
try:
ret = method(*args, **kwargs)
except KeyboardInterrupt:
@@ -209,7 +209,7 @@ def doCall(method, *args, **kwargs):
else:
failure = 1
except httplib.IncompleteRead:
- print "httplib.IncompleteRead"
+ print "httplib.IncompleteRead"
raise up2dateErrors.CommunicationError("httplib.IncompleteRead"), None, \
sys.exc_info()[2]
except urllib2.HTTPError, e:
@@ -219,9 +219,9 @@ def doCall(method, *args, **kwargs):
msg = msg + "Error Message: %s\n" % e.msg
log.log_me(msg)
raise up2dateErrors.CommunicationError(msg), None, sys.exc_info()[2]
-
+
except xmlrpclib.ProtocolError, e:
-
+
log.log_me("A protocol error occurred: %s , attempt #%s," % (
e.errmsg, attempt_count))
if e.errcode == 404:
@@ -255,7 +255,7 @@ def doCall(method, *args, **kwargs):
pkg = args[0]
else:
pkg=args[1]
-
+
if type(pkg) == type([]):
pkgName = "%s-%s-%s.%s" % (pkg[0], pkg[1], pkg[2], pkg[4])
else:
@@ -263,13 +263,13 @@ def doCall(method, *args, **kwargs):
msg = "File Not Found: %s\n%s" % (pkgName, errMsg)
log.log_me(msg)
raise up2dateErrors.FileNotFoundError(msg), None, sys.exc_info()[2]
-
+
if not reset:
if attempt_count >= attempts:
raise up2dateErrors.CommunicationError(e.errmsg), None, \
sys.exc_info()[2] else:
failure = 1
-
+
except xmlrpclib.ResponseError:
raise up2dateErrors.CommunicationError(
"Broken response from the server."), None, sys.exc_info()[2]
@@ -284,9 +284,9 @@ def doCall(method, *args, **kwargs):
# rest for five seconds before trying again
time.sleep(5)
attempt_count = attempt_count + 1
-
+
if attempt_count > attempts:
raise up2dateErrors.CommunicationError("The data returned from the \
server was incomplete")
return ret
-
+
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpmUtils.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpmUtils.py
index b51875b..4f4b09a 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpmUtils.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpmUtils.py
@@ -22,17 +22,17 @@ import gettext
t = gettext.translation('rhn-client-tools', fallback=True)
_ = t.ugettext
-def installedHeaderByKeyword(**kwargs):
+def installedHeaderByKeyword(**kwargs):
""" just cause this is such a potentially useful looking method... """
- _ts = transaction.initReadOnlyTransaction()
- mi = _ts.dbMatch()
- for keyword in kwargs.keys():
- mi.pattern(keyword, rpm.RPMMIRE_GLOB, kwargs[keyword])
- # we really shouldnt be getting multiples here, but what the heck
- headerList = []
- for h in mi:
- headerList.append(h)
-
+ _ts = transaction.initReadOnlyTransaction()
+ mi = _ts.dbMatch()
+ for keyword in kwargs.keys():
+ mi.pattern(keyword, rpm.RPMMIRE_GLOB, kwargs[keyword])
+ # we really shouldnt be getting multiples here, but what the heck
+ headerList = []
+ for h in mi:
+ headerList.append(h)
+
return headerList
def verifyPackages(packages):
@@ -40,7 +40,7 @@ def verifyPackages(packages):
and return a dict keyed off that data
"""
data = {}
- missing_packages = []
+ missing_packages = []
# data structure is keyed off package
# label, with value being an array of each
# line of the output from -V
@@ -64,7 +64,7 @@ def verifyPackages(packages):
del(keywords[key])
headers = installedHeaderByKeyword(**keywords)
- if len(headers) == 0:
+ if len(headers) == 0:
missing_packages.append(package)
for header in headers:
@@ -75,7 +75,7 @@ def verifyPackages(packages):
arch = header["arch"]
if arch == None:
arch = ""
-
+
pkg = (header['name'], header['version'],
header['release'], epoch,
arch)
@@ -85,13 +85,13 @@ def verifyPackages(packages):
packageLabel = "%s-%s-%s" % (pkg[0], pkg[1], pkg[2])
else:
packageLabel = "%s-%s-%s.%s" % (pkg[0], pkg[1], pkg[2], pkg[4])
-
+
verifystring = "/usr/bin/rpmverify -V %s" % packageLabel
-
+
fd = os.popen(verifystring)
res = fd.readlines()
fd.close()
-
+
reslist = []
for line in res:
reslist.append(line.strip())
@@ -107,21 +107,21 @@ def getInstalledPackageList(msgCallback = None, \
progressCallback = None, version, release and optionaly arch and cookie
"""
pkg_list = []
-
+
if msgCallback != None:
msgCallback(_("Getting list of packages installed on the system"))
-
- _ts = transaction.initReadOnlyTransaction()
+
+ _ts = transaction.initReadOnlyTransaction()
count = 0
total = 0
-
+
for h in _ts.dbMatch():
if h == None:
break
count = count + 1
-
+
total = count
-
+
count = 0
for h in _ts.dbMatch():
if h == None:
@@ -150,11 +150,11 @@ def getInstalledPackageList(msgCallback = None, \
progressCallback = None, pkg_list.append(package)
else:
pkg_list.append(package)
-
+
if progressCallback != None:
progressCallback(count, total)
count = count + 1
-
+
pkg_list.sort(key=lambda x:(x['name'], x['epoch'], x['version'], x['release']))
return pkg_list
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/transaction.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/transaction.py
index 999577f..308c63f 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/transaction.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/transaction.py
@@ -6,7 +6,7 @@
# Adrian Likins <alikins@redhat.com
#
#
-# a couple of classes wrapping up transactions so that we
+# a couple of classes wrapping up transactions so that we
# can share transactions instead of creating new ones all over
#
@@ -70,7 +70,7 @@ class TransactionData:
pkgInfo[2], pkgInfo[3])
return out
-
+
# wrapper/proxy class for rpm.Transaction so we can
# instrument it, etc easily
class Up2dateTransaction:
@@ -115,7 +115,7 @@ class Up2dateTransaction:
def popVSFlags(self):
del self.tsflags[-1]
self.ts.setVSFlags(self.tsflags[-1])
-
+
def initReadOnlyTransaction():
global read_ts
if read_ts == None:
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/tui.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/tui.py \
index 86d79e1..3892700 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/tui.py
@@ -52,7 +52,7 @@ def WarningWindow(screen, errmsg):
[OK.encode('utf-8')])
screen.finish()
-
+
def ConfirmQuitWindow(screen):
button = snack.ButtonChoiceWindow(screen, CONFIRM_QUIT.encode('utf-8'),
CONFIRM_QUIT_SURE.encode('utf-8') + "\n" + \
@@ -74,8 +74,8 @@ def ConfirmQuitWindow(screen):
return 1
else:
return 0
-
-
+
+
def tui_call_wrapper(screen, func, *params):
try:
@@ -85,14 +85,14 @@ def tui_call_wrapper(screen, func, *params):
except up2dateErrors.SSLCertificateVerifyFailedError, e:
FatalErrorWindow(screen, e.errmsg)
except up2dateErrors.NoBaseChannelError, e:
- FatalErrorWindow(screen, e.errmsg + '\n' +
- BASECHANNELERROR % (up2dateUtils.getArch(),
+ FatalErrorWindow(screen, e.errmsg + '\n' +
+ BASECHANNELERROR % (up2dateUtils.getArch(),
up2dateUtils.getOSRelease(),
up2dateUtils.getVersion()))
except up2dateErrors.SSLCertificateFileNotFound, e:
FatalErrorWindow(screen, e.errmsg + '\n\n' +
SSL_CERT_FILE_NOT_FOUND_ERRER)
-
+
return results
class WindowSkipException:
@@ -206,7 +206,7 @@ class ConnectWindow:
config.setServerURL(self.server)
cfg.save()
-
+
self.proxy = cfg['httpProxy']
toplevel = snack.GridForm(self.screen, CONNECT_WINDOW.encode('utf-8'), 1, 1)
@@ -216,11 +216,11 @@ class ConnectWindow:
if self.proxy:
text += CONNECT_WINDOW_TEXT2 % self.proxy
- tb = snack.Textbox(size[0]-30, size[1]-20,
+ tb = snack.Textbox(size[0]-30, size[1]-20,
text.encode('utf-8'),
1, 1)
- toplevel.add(tb, 0, 0, padding = (0, 0, 0, 1))
+ toplevel.add(tb, 0, 0, padding = (0, 0, 0, 1))
self.g = toplevel
@@ -234,7 +234,7 @@ class ConnectWindow:
result = self.g.draw()
self.screen.refresh()
tui_call_wrapper(self.screen, rhnreg.getCaps)
-
+
self.screen.popWindow()
# Just return next, although the user wouldn't have actually pressed
@@ -243,9 +243,9 @@ class ConnectWindow:
def saveResults(self):
pass
-
+
class StartWindow:
-
+
def __init__(self, screen, tui):
self.name = "StartWindow"
self.screen = screen
@@ -324,7 +324,7 @@ class WhyRegisterWindow:
button = self.bb.buttonPressed(result)
return button
-
+
class InfoWindow:
@@ -335,7 +335,7 @@ class InfoWindow:
self.tui.alreadyRegistered = 0
self.server = self.tui.serverURL
-
+
size = snack._snack.size()
toplevel = snack.GridForm(screen, REGISTER_WINDOW.encode('utf-8'), 1, 4)
@@ -431,7 +431,7 @@ class InfoWindow:
def saveResults(self):
self.tui.userName = self.userNameEntry.value()
self.tui.password = self.passwordEntry.value()
-
+
def run(self):
log.log_debug("Running %s" % self.__class__.__name__)
self.screen.refresh()
@@ -451,7 +451,7 @@ class InfoWindow:
self.screen.popWindow()
return button
-
+
class OSReleaseWindow:
def __init__(self, screen, tui):
@@ -478,10 +478,10 @@ class OSReleaseWindow:
self.name = "OSReleaseWindow"
self.screen = screen
- self.size = snack._snack.size()
+ self.size = snack._snack.size()
self.selectChannel = False
-
+
toplevel = snack.GridForm(self.screen, SELECT_OSRELEASE.encode('utf-8'), 1, \
7) self.g = toplevel
@@ -502,7 +502,7 @@ class OSReleaseWindow:
self.sublabel = snack.Label(MINOR_RELEASE.encode('utf-8'))
toplevel.add(self.sublabel, 0, 2, anchorLeft = 1)
- self.channelList = snack.Listbox(self.size[1]-22, 1,
+ self.channelList = snack.Listbox(self.size[1]-22, 1,
width = self.size[0]-10)
toplevel.add(self.channelList, 0, 3)
@@ -517,16 +517,16 @@ class OSReleaseWindow:
optiontext2 = ALL_UPDATES.encode('utf-8')
if self.tui.all_updates_button:
- self.all_updates_button = snack.SingleRadioButton(optiontext2,
+ self.all_updates_button = snack.SingleRadioButton(optiontext2,
self.limited_updates_button, isOn=1)
else:
- self.all_updates_button = snack.SingleRadioButton(optiontext2,
+ self.all_updates_button = snack.SingleRadioButton(optiontext2,
self.limited_updates_button)
-
+
toplevel.add(self.all_updates_button, 0, 5, padding = (0, 0, 0, 1),
anchorLeft = 1)
- #self.warning = snack.TextboxReflowed(self.size[0]-10,
+ #self.warning = snack.TextboxReflowed(self.size[0]-10,
# CHANNEL_PAGE_WARNING.encode('utf-8'))
#toplevel.add(self.warning, 0, 9, anchorLeft = 1)
@@ -539,7 +539,7 @@ class OSReleaseWindow:
self.screen.refresh()
-
+
def run(self):
log.log_debug("Running %s" % self.__class__.__name__)
@@ -566,7 +566,7 @@ class OSReleaseWindow:
if self.limited_updates_button.selected():
later_release = self.channelList.current() != \
self.available_channels['default_channel']
-
+
title = CONFIRM_OS_RELEASE_SELECTION.encode('utf-8')
if later_release:
msgbox = snack.ButtonChoiceWindow(self.screen, title,
@@ -615,7 +615,7 @@ class HardwareWindow:
# read all hardware in
tui.hardware = hardware.Hardware()
-
+
toplevel = snack.GridForm(screen, HARDWARE_WINDOW.encode('utf-8'), 1, 7)
text = snack.TextboxReflowed(70, HARDWARE_WINDOW_DESC1.encode('utf-8'))
@@ -631,12 +631,12 @@ class HardwareWindow:
grid.setField(self.profileEntry, 1, 0, anchorLeft = 1)
toplevel.add(grid, 0, 1, anchorLeft = 1)
-
+
if tui.includeHardware:
self.hardwareButton = \
snack.Checkbox(HARDWARE_WINDOW_CHECKBOX.encode('utf-8'), isOn = 1) else:
self.hardwareButton = \
snack.Checkbox(HARDWARE_WINDOW_CHECKBOX.encode('utf-8'))
-
+
toplevel.add(self.hardwareButton, 0, 2, padding = (0, 1, 0, 0),
anchorLeft = 1)
@@ -655,10 +655,10 @@ class HardwareWindow:
hardware_text += _("CPU model: ")
- for hw in tui.hardware:
+ for hw in tui.hardware:
if hw['class'] == 'CPU':
hardware_text += hw['model'] +"\n"
-
+
hardware_text += _("Hostname: ")
for hw in tui.hardware:
@@ -673,7 +673,7 @@ class HardwareWindow:
hardware_text += _("CPU speed: ")
- for hw in tui.hardware:
+ for hw in tui.hardware:
if hw['class'] == 'CPU':
hardware_text += _("%d MHz") % hw['speed'] + " "
@@ -699,7 +699,7 @@ class HardwareWindow:
toplevel.add(self.additionalHWLabel, 0, 5, padding = (0, 1, 0, 0),
anchorLeft = 1)
-
+
# BUTTON BAR
self.bb = snack.ButtonBar(screen,
[(NEXT.encode('utf-8'), "next"),
@@ -771,7 +771,7 @@ class PackagesWindow:
package['release']),
item = package['name'],
selected = 1)
-
+
# BUTTON BAR
self.bb = snack.ButtonBar(screen,
[(NEXT.encode('utf-8'), "next"),
@@ -786,7 +786,7 @@ class PackagesWindow:
self.scale.set(int(((amount * 1.0)/ total) * 100))
self.pwin.draw()
self.screen.refresh()
-
+
def saveResults(self):
self.tui.includePackages = self.packagesButton.selected()
@@ -795,7 +795,7 @@ class PackagesWindow:
if pkg['name'] in selection:
self.tui.selectedPackages.append(pkg)
-
+
def run(self):
log.log_debug("Running %s" % self.__class__.__name__)
result = self.g.runOnce()
@@ -812,7 +812,7 @@ class SendWindow:
self.tui = tui
self.name = "SendWindow"
size = snack._snack.size()
-
+
toplevel = snack.GridForm(screen, SEND_WINDOW.encode('utf-8'), 1, 2)
text = snack.TextboxReflowed(size[0]-15, SEND_WINDOW_DESC.encode('utf-8'))
@@ -862,25 +862,25 @@ class SendingWindow:
reg_info = None
try:
- # reg_info dict contains: 'system_id', 'channels',
+ # reg_info dict contains: 'system_id', 'channels',
# 'failed_channels', 'slots', 'failed_slots'
log.log_debug('other is %s' % str(self.tui.other))
reg_info = rhnreg.registerSystem2(self.tui.userName, self.tui.password,
- self.tui.profileName,
+ self.tui.profileName,
other = self.tui.other)
reg_info = reg_info.rawDict
-
+
if isinstance(reg_info['system_id'], unicode):
systemId = unicode.encode(reg_info['system_id'], 'utf-8')
else:
systemId = reg_info['system_id']
-
+
except up2dateErrors.CommunicationError, e:
- FatalErrorWindow(self.screen,
+ FatalErrorWindow(self.screen,
_("Problem registering system:\n") + e.errmsg)
except up2dateErrors.RhnUuidUniquenessError, e:
- FatalErrorWindow(self.screen,
+ FatalErrorWindow(self.screen,
_("Problem registering system:\n") + e.errmsg)
except up2dateErrors.InsuffMgmntEntsError, e:
FatalErrorWindow(self.screen,
@@ -894,14 +894,14 @@ class SendingWindow:
# write the system id out.
if not rhnreg.writeSystemId(systemId):
- FatalErrorWindow(self.screen,
+ FatalErrorWindow(self.screen,
_("Problem writing out system id to disk."))
self.setScale(1, 4)
# include the info from the oeminfo file as well
self.oemInfo = rhnreg.getOemInfo()
-
+
# dont send if already registered, do send if they have oemInfo
if ( not self.tui.alreadyRegistered ) or ( len(self.oemInfo)):
# send product registration information
@@ -913,17 +913,17 @@ class SendingWindow:
except:
print sys.exc_info()
print sys.exc_type
-
- FatalErrorWindow(self.screen,
+
+ FatalErrorWindow(self.screen,
_("Problem registering personal information"))
-
+
else:
rhnreg.registerProduct(systemId, \
self.tui.productInfo,self.tui.oemInfo) try:
rhnreg.registerProduct(systemId, \
self.tui.productInfo,self.tui.oemInfo) except up2dateErrors.CommunicationError, e:
- FatalErrorWindow(self.screen,
- _("Problem registering personal \
information:\n") + + FatalErrorWindow(self.screen,
+ _("Problem registering personal \
information:\n") + e.errmsg)
except:
log.log_exception(*sys.exc_info())
@@ -1033,7 +1033,7 @@ class ReviewWindow:
self.tui = tui
self.reg_info = tui.reg_info
size = snack._snack.size()
-
+
toplevel = snack.GridForm(screen, REVIEW_WINDOW.encode('utf-8'), 1, 2)
review_window_text = ''
@@ -1056,7 +1056,7 @@ class ReviewWindow:
channels = CHANNELS_TITLE + "\n" + \
OK_CHANNELS + "\n" + \
- "%s\n"
+ "%s\n"
# If it's hosted, reference the hosted url,
# otherwise, we don't know the url for their sat.
@@ -1067,7 +1067,7 @@ class ReviewWindow:
channels += CHANNELS_SAT_WARNING
review_window_text += channels % channel_list + "\n\n"
-
+
if len(self.reg_info['system_slots']) > 0:
slot_list = ""
for slot in self.reg_info['system_slots']:
@@ -1086,17 +1086,17 @@ class ReviewWindow:
else:
slot_list += slot + "\n"
review_window_text += SLOTS % slot_list + "\n\n"
-
+
if len(self.reg_info['universal_activation_key']) > 0:
act_key_list = ""
for act_key in self.reg_info['universal_activation_key']:
act_key_list += act_key
review_window_text += ACTIVATION_KEY % (act_key_list)
-
+
self.review_window = snack.Textbox(size[0]-10, size[1]-14, \
review_window_text.encode('utf-8'), 1, 1)
-
+
toplevel.add(self.review_window, 0, 0, padding = (0, 1, 0, 0))
-
+
# BUTTON BAR
self.bb = snack.ButtonBar(screen, [(OK.encode('utf-8'), "next")])
toplevel.add(self.bb, 0, 1, padding = (0, 1, 0, 0),
@@ -1118,9 +1118,9 @@ class ReviewWindow:
button = "exit"
if self.tui.yum_plugin_conf_error:
button = "exit"
-
- return button
-
+
+ return button
+
class Tui:
def __init__(self, screen, test):
@@ -1150,15 +1150,15 @@ class Tui:
FinishWindow
]
self.serverURL = config.getServerlURL()[0]
-
+
if not cfg['sslCACert']:
- # Always use the path from the cert if available, else set to
+ # Always use the path from the cert if available, else set to
# default location
if self.serverType == "hosted":
cfg.set('sslCACert', '/usr/share/rhn/RHNS-CA-CERT')
else:
- cfg.set('sslCACert', '/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT')
-
+ cfg.set('sslCACert', '/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT')
+
def __del__(self):
self.screen.finish()
@@ -1187,12 +1187,12 @@ class Tui:
"country" : "",
}
- self.other = {}
+ self.other = {}
self.other['registration_number'] = ''
-
+
self.profileName = ""
self.includeHardware = 1
-
+
self.limited_updates_button = 1
self.all_updates_button = 0
self.includePackages = 0
@@ -1205,7 +1205,7 @@ class Tui:
def run(self):
log.log_debug("Running %s" % self.__class__.__name__)
self.initResults()
-
+
direction = "forward"
try:
@@ -1223,7 +1223,7 @@ class Tui:
continue
log.log_debug("index is %s" % index)
-
+
result = win.run()
log.log_debug("Result %s" % result)
@@ -1238,11 +1238,11 @@ class Tui:
elif result == "cancel":
log.log_debug("Caught a cancel request")
-
+
# Show the confirm quit window
if ConfirmQuitWindow(self.screen) == 1:
return
-
+
elif result == "next":
index = index + 1
win.saveResults()
@@ -1251,9 +1251,9 @@ class Tui:
finally:
self.screen.finish()
-
+
def main():
- test = 0
+ test = 0
signal.signal(signal.SIGINT, signal.SIG_IGN)
if len(sys.argv) > 1:
@@ -1268,6 +1268,6 @@ def main():
tui = Tui(screen, test)
tui.run()
-
+
if __name__ == "__main__":
main()
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateAuth.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateAuth.py
index d0d02f4..20ed1e9 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateAuth.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateAuth.py
@@ -24,10 +24,10 @@ def getSystemId():
path = cfg["systemIdPath"]
if not os.access(path, os.R_OK):
return None
-
+
f = open(path, "r")
ret = f.read()
-
+
f.close()
return ret
@@ -43,10 +43,10 @@ def maybeUpdateVersion():
return 0
systemVer = up2dateUtils.getVersion()
-
+
if idVer != systemVer:
s = rhnserver.RhnServer()
-
+
newSystemId = s.registration.upgrade_version(getSystemId(), systemVer)
path = cfg["systemIdPath"]
@@ -90,7 +90,7 @@ def writeCachedLogin():
return False
data = {'time': time.time(),
'loginInfo': loginInfo}
-
+
pcklDir = os.path.dirname(pcklAuthFileName)
if not os.access(pcklDir, os.W_OK):
try:
@@ -104,7 +104,7 @@ def writeCachedLogin():
pickle.dump(data, pcklAuth)
pcklAuth.close()
expireTime = data['time'] + float(loginInfo['X-RHN-Auth-Expire-Offset'])
- log.log_debug("Wrote pickled loginInfo at ", data['time'], " with expiration of \
", + log.log_debug("Wrote pickled loginInfo at ", data['time'], " with expiration \
of ", expireTime, " seconds.")
return True
@@ -131,9 +131,9 @@ def readCachedLogin():
li = data['loginInfo']
currentTime = time.time()
expireTime = createdTime + float(li['X-RHN-Auth-Expire-Offset'])
- #Check if expired, offset is stored in "X-RHN-Auth-Expire-Offset"
+ #Check if expired, offset is stored in "X-RHN-Auth-Expire-Offset"
log.log_debug("Checking pickled loginInfo, currentTime=", currentTime,
- ", createTime=", createdTime, ", expire-offset=",
+ ", createTime=", createdTime, ", expire-offset=",
float(li['X-RHN-Auth-Expire-Offset']))
if (currentTime > expireTime):
log.log_debug("Pickled loginInfo has expired, created = %s, expire = %s." \
@@ -179,12 +179,12 @@ def login(systemId=None, forceUpdateúlse):
if not systemId:
return None
-
+
maybeUpdateVersion()
log.log_me("logging into up2date server")
li = server.up2date.login(systemId)
-
+
# figure out if were missing any needed caps
server.capabilities.validate()
_updateLoginInfo(li) #update global var, loginInfo
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateErrors.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateErrors.py
index eec8099..5220826 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -173,7 +173,7 @@ class InvalidRegistrationNumberError(ValidationError):
class InvalidProductRegistrationError(NoLogError):
"""indicates an error during server input validation"""
premsg = _("The installation number is invalid")
-
+
class OemInfoFileError(NoLogError):
premsg = _("Error parsing the oemInfo file at field:\n")
@@ -228,15 +228,15 @@ class SSLCertificateFileNotFound(Error):
class AuthenticationOrAccountCreationError(ValidationError):
"""Class that can represent different things depending on context:
- While logging in with an existing user it represents a username or password
+ While logging in with an existing user it represents a username or password
being incorrect.
- While creating a new account, it represents the username already being
+ While creating a new account, it represents the username already being
taken or the user not being allowed to create an account.
Optimally these different things would be different exceptions, but there
are single fault codes the server can return to the client that can mean
- more than one of them so we have no way of knowing which is actually
+ more than one of them so we have no way of knowing which is actually
intended.
-
+
"""
pass
@@ -272,19 +272,19 @@ class InsuffMgmntEntsError(RhnServerException):
def changeExplanation(self, msg):
newExpln = _("""
Your organization does not have enough Management entitlements to register this
- system to Red Hat Network. Please notify your organization administrator of this \
error.
- You should be able to register this system after your organization frees \
existing + system to Red Hat Network. Please notify your organization \
administrator of this error. + You should be able to register this system after \
your organization frees existing
or purchases additional entitlements. Additional entitlements may be purchased \
by your
organization administrator by logging into Red Hat Network and visiting
the 'Subscription Management' page in the 'Your RHN' section of RHN.
-
+
A common cause of this error code is due to having mistakenly setup an
Activation Key which is set as the universal default. If an activation key is \
set
on the account as a universal default, you can disable this key and retry to \
avoid requiring a Management entitlement.""")
term = "Explanation:"
loc = msg.rindex(term) + len(term)
- return msg[:loc] + newExpln
+ return msg[:loc] + newExpln
class NoSystemIdError(NoLogError):
pass
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateLog.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateLog.py
index 6daa772..1fe5c95 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateLog.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateLog.py
@@ -14,18 +14,18 @@ class Log:
self.app = "up2date"
self.cfg = config.initUp2dateConfig()
self.log_info = ''
-
+
def set_app_name(self, name):
self.app = str(name)
-
+
def log_debug(self, *args):
if self.cfg["debug"] > 1:
self.log_me("D: ", *args)
-
+
def log_me(self, *args):
"""General logging function.
Eg: log_me("I am a banana.")
-
+
"""
self.log_info = "[%s] %s" % (time.ctime(time.time()), self.app)
s = u""
@@ -52,9 +52,9 @@ class Log:
output = output + traceback.format_list(traceback.extract_tb(tb))
output.append("%s: %s\n" % (logtype, value))
self.write_log("".join(output))
-
+
def write_log(self, s):
-
+
log_name = self.cfg["logFile"] or "/var/log/up2date"
log_file = open(log_name, 'a')
msg = u"%s %s\n" % (self.log_info, s)
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/yumPlugin.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/yumPlugin.py
index 4d70c47..73dfe3b 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/yumPlugin.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/yumPlugin.py
@@ -5,8 +5,8 @@ import os
import re
import rpm
-# global variables
-YUM_PLUGIN_CONF = '/etc/yum/pluginconf.d/rhnplugin.conf'
+# global variables
+YUM_PLUGIN_CONF = '/etc/yum/pluginconf.d/rhnplugin.conf'
def pluginEnable():
"""Enables yum-rhn-plugin, may throw IOError"""
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/test/haltreetests.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/test/haltreetests.py \
index 0314c90..41defcc 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/test/haltreetests.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/test/haltreetests.py
@@ -28,7 +28,7 @@ class HalDeviceTests(unittest.TestCase):
def test_no_parent(self):
properties = { 'info.udi' : 'foo/bar/disk/3' }
device = haltree.HalDevice(properties)
-
+
self.assertEquals(None, device.parent_udi)
def test_with_parent(self):
@@ -36,7 +36,7 @@ class HalDeviceTests(unittest.TestCase):
properties = { 'info.udi' : 'foo/bar/disk/3',
'info.parent' : parent_udi }
device = haltree.HalDevice(properties)
-
+
self.assertEquals(parent_udi, device.parent_udi)
@@ -46,7 +46,7 @@ class HalTreeTests(unittest.TestCase):
properties = { 'info.udi' : 'foo/bar/computer' }
self.head = haltree.HalDevice(properties)
- properties = { 'info.udi' : 'foo/bar/disk/3',
+ properties = { 'info.udi' : 'foo/bar/disk/3',
'info.parent' : 'foo/bar/computer' }
self.child = haltree.HalDevice(properties)
@@ -54,13 +54,13 @@ class HalTreeTests(unittest.TestCase):
def test_add_head(self):
tree = haltree.HalTree()
tree.add(self.head)
-
+
self.assertEquals(self.head, tree.head)
def test_add_device_no_head(self):
tree = haltree.HalTree()
tree.add(self.child)
-
+
self.assertEquals(None, tree.head)
def test_add_head_single_child_child_first(self):
@@ -91,6 +91,6 @@ def suite():
suite.addTest(unittest.makeSuite(HalDeviceTests))
suite.addTest(unittest.makeSuite(HalTreeTests))
return suite
-
+
if __name__ == "__main__":
unittest.main(defaultTest="suite")
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/test/testByteRangeRpcServer.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/test/testByteRangeRpcServer.py
index d36daeb..10a2b76 100755
--- a/client/debian/packages-already-in-debian/rhn-client-tools/test/testByteRangeRpcServer.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/test/testByteRangeRpcServer.py
@@ -32,6 +32,6 @@ def suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestClientCaps))
return suite
-
+
if __name__ == "__main__":
unittest.main(argv=sys.argv)
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/test/testClientCaps.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/test/testClientCaps.py \
index 4860cf3..db42867 100755
--- a/client/debian/packages-already-in-debian/rhn-client-tools/test/testClientCaps.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/test/testClientCaps.py
@@ -87,9 +87,9 @@ class TestClientCaps(unittest.TestCase):
os.makedirs(dirname)
try:
clientCaps.loadLocalCaps(test_clientCaps_d)
- os.rmdir(dirname)
+ os.rmdir(dirname)
except:
- os.rmdir(dirname)
+ os.rmdir(dirname)
self.fail()
@@ -110,6 +110,6 @@ def suite():
suite.addTest(unittest.makeSuite(TestClientCaps))
suite.addTest(unittest.makeSuite(TestLoginWithCaps))
return suite
-
+
if __name__ == "__main__":
unittest.main(defaultTest="suite")
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/test/testConfig.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/test/testConfig.py index \
823f8fa..7ff4a22 100755
--- a/client/debian/packages-already-in-debian/rhn-client-tools/test/testConfig.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/test/testConfig.py
@@ -23,9 +23,9 @@ class TestConfig(unittest.TestCase):
pass
def tearDown(self):
- config.cfg == None
+ config.cfg == None
testutils.restoreConfig()
-
+
def testEmptyInit(self):
"Verify that the class can be created with no arguments"
cfg = config.initUp2dateConfig(test_up2date)
@@ -144,8 +144,8 @@ class TestConfig(unittest.TestCase):
"Verify that Config.load() works without exception"
cfg = config.initUp2dateConfig(test_up2date)
cfg.load("/etc/sysconfig/rhn/up2date")
-
-
+
+
def testNetworkConfig(self):
"Verify that the NetworkConfig class can be created"
nc = config.NetworkConfig()
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/test/testRhnChannel.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/test/testRhnChannel.py \
index 8285c52..87e0e3c 100755
--- a/client/debian/packages-already-in-debian/rhn-client-tools/test/testRhnChannel.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/test/testRhnChannel.py
@@ -36,7 +36,7 @@ class testRhnChannel(unittest.TestCase):
'org_id': '',
'id': '63',
'label': 'redhat-linux-i386-9'}]
-
+
def testGetChannelDetails(self):
"rhnChannel.GetChannelDetails"
res = rhnChannel.getChannelDetails()
@@ -53,7 +53,7 @@ class testRhnChannel(unittest.TestCase):
def testGetChannels(self):
"Test rhnChannel.getChannels()"
res = rhnChannel.getChannels()
-
+
write(res)
def testUpdateChannels(self):
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/test/testRpcServer.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/test/testRpcServer.py \
index 0845452..800ee0b 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/test/testRpcServer.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/test/testRpcServer.py
@@ -40,14 +40,14 @@ class TestGetServer(unittest.TestCase):
def __callback(self):
write("callback called")
-
+
def testGetServerDefaultWithRefreshCallback(self):
"Verify that getServer works with default config and a refreshCallback"
try:
s = rpcServer.getServer(refreshCallback=self.__callback)
except:
self.fail("Got an expection calling rpcServer.getServer")
-
+
def testGetServerRedirectServer(self):
"Verify that getServer works when talking to a server that redirects"
self.cfg['serverURL'] = "https://rhn.redhat.com/XMLRPC-REDIRECT"
@@ -78,8 +78,8 @@ class TestGetServer(unittest.TestCase):
s = rpcServer.getServer()
except:
self.fail("Got an expection calling rpcServer.getServer")
-
-
+
+
def testGetServerAuthProxyNoPassword(self):
"Verify that getSerer works when specifying an an auth proxy and no user \
password" sys.path.append("/etc/sysconfig/rhn/")
@@ -128,7 +128,7 @@ class TestGetServer(unittest.TestCase):
def testGetServerMultipleCaCert(self):
"getServer with a multiple CA certs"
rpcServer.rhns_ca_certs = ["/usr/share/rhn/RHNS-CA-CERT", \
"/usr/share/rhn/RHNS-CA-CERT"]
-
+
try:
s = rpcServer.getServer()
except:
@@ -138,7 +138,7 @@ class TestGetServer(unittest.TestCase):
class TestRpcServer500Error(unittest.TestCase):
def setUp(self):
-
+
self.defaultServer = testConfig.brokenServer500error
import testutils
testutils.setupConfig("fc1-at-pepsi")
@@ -146,7 +146,7 @@ class TestRpcServer500Error(unittest.TestCase):
# cant import config until we put the right stuff in place
self.cfg = config.initUp2dateConfig(test_up2date)
self.cfg['serverURL'] = self.defaultServer
-
+
def tearDown(self):
import testutils
testutils.restoreConfig()
@@ -154,7 +154,7 @@ class TestRpcServer500Error(unittest.TestCase):
def testDefaultWelcomeMessage(self):
"Test welcome_message call with no redirects or proxies"
s = rpcServer.getServer()
-
+
ret = s.registration.welcome_message()
## def testListPackages(self):
@@ -181,7 +181,7 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
self.FourOhFourServerSSL = "https://xmlrpc.rhn.redhat.com/XMLSSDFSD"
self.FourOhFourServer = "http://xmlrpc.rhn.redhat.com/XMLSSDFSD"
unittest.TestCase.__init__(self, methodname)
-
+
def setUp(self):
self.cfg = config.initUp2dateConfig(test_up2date)
self.defaultServer = self.cfg['serverURL']
@@ -193,13 +193,13 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
self.cfg['serverURL'] = self.defaultServer
self.cfg['enableProxy'] = 0
self.cfg['enableAuthProxy'] = 0
-
+
def testDefaultWelcomeMessage(self):
"Test welcome_message call with no redirects or proxies"
s = rpcServer.getServer()
s.registration.welcome_message()
-
+
def testDefaultWelcomeMessageFailoverNonExistentServer(self):
"Test welcome_message call faling over from a non existent server"
self.cfg['serverURL'] = [ self.neServer,
@@ -213,7 +213,7 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
'https://SECRET_URL/XMLRPC']
s = rpcServer.getServer()
s.registration.welcome_message()
-
+
def testDefaultWelcomeMessageFailoverNonExistentServerRedirect(self):
"Test welcome_message call faling over from a non existent server to a \
redirect" self.cfg['serverURL'] = [ self.neServer,
@@ -227,7 +227,7 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
'https://SECRET_URL/XMLRPC-REDIRECT']
s = rpcServer.getServer()
s.registration.welcome_message()
-
+
def testDefaultWelcomeMessageHttpsToHttps(self):
"Test redirecting https to https"
self.cfg['serverURL'] = "https://SECRET_URL/XMLRPC-REDIRECT"
@@ -251,7 +251,7 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
else:
self.fail("IOError expected here but didnt get it")
-
+
def testDefaultWelcomeMessageHttpsToHttpFailovers(self):
"Test redirecting https to http after failing over from bad servers"
self.cfg['serverURL'] = [self.neServer,
@@ -262,7 +262,7 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
try:
s.registration.welcome_message()
except rpclib.InvalidRedirectionError:
-
+
pass
else:
self.fail("InvalidRedirectionError expected here but didnt get it")
@@ -277,7 +277,7 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
try:
s.registration.welcome_message()
except rpclib.InvalidRedirectionError:
-
+
pass
else:
self.fail("InvalidRedirectionError expected here but didnt get it")
@@ -292,12 +292,12 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
try:
s.registration.welcome_message()
except rpclib.InvalidRedirectionError:
-
+
pass
else:
self.fail("InvalidRedirectionError expected here but didnt get it")
-
+
def testDefaultWelcomeMessageHttpsToHttpFailoversSSL(self):
"Test redirecting https to http after failing over from bad ssl servers"
self.cfg['serverURL'] = [self.neServerSSL,
@@ -308,11 +308,11 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
try:
s.registration.welcome_message()
except rpclib.InvalidRedirectionError:
-
+
pass
else:
self.fail("InvalidRedirectionError expected here but didnt get it")
-
+
def testDefaultWelcomeMessageHttpToHttp(self):
"Test redirecting http to http"
self.cfg['serverURL'] = "http://SECRET_URL/XMLRPC-REDIRECT-NOSSL"
@@ -368,7 +368,7 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
pass
else:
self.fail("InvalidRedirectionError expected here but didnt get it")
-
+
def testDefaultWelcomeMessageHttpToHttpRedirectsOff(self):
"Test redirecting http to http and verify if tails with allow_redirect off"
self.cfg['serverURL'] = "http://SECRET_URL/XMLRPC-REDIRECT-NOSSL"
@@ -407,7 +407,7 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
s.registration.welcome_message()
ret = s.redirected()
self.assertEqual(ret, "https://SECRET_URL/XMLRPC")
-
+
def testDefaultWelcomeMessageHttpsToHttpCheckRedirect(self):
"Test redirecting https to http and verify redirect()"
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/test/testRpmUtils.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/test/testRpmUtils.py \
index 84bf4bb..91c1d41 100755
--- a/client/debian/packages-already-in-debian/rhn-client-tools/test/testRpmUtils.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/test/testRpmUtils.py
@@ -19,7 +19,7 @@ class TestVerifyPackages(unittest.TestCase):
def __setupData(self):
pass
-
+
def testEmptyLabelList(self):
"Verify that the verifyPackages call with empty list works"
data, missing_packages = pkgUtils.verifyPackages([])
@@ -88,6 +88,6 @@ def suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestVerifyPackages))
return suite
-
+
if __name__ == "__main__":
unittest.main(defaultTest="suite")
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/test/testSSLSocketTimeout.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/test/testSSLSocketTimeout.py
index 361b215..e6c278b 100755
--- a/client/debian/packages-already-in-debian/rhn-client-tools/test/testSSLSocketTimeout.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/test/testSSLSocketTimeout.py
@@ -17,7 +17,7 @@ class TestSomething(unittest.TestCase):
def __setupData(self):
pass
-
+
def testHttpConnection(self):
con = httplib.HTTPConnection("www.adrianlikins.com")
con.request("GET", "/")
@@ -39,13 +39,13 @@ class TestSomething(unittest.TestCase):
con.request("GET", "/")
r1 = con.getresponse()
data = r1.read()
- con.close()
+ con.close()
def suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestSomething))
return suite
-
+
if __name__ == "__main__":
unittest.main(argv=sys.argv)
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/test/testTransactions.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/test/testTransactions.py \
index e4d0c97..b4ada21 100755
--- a/client/debian/packages-already-in-debian/rhn-client-tools/test/testTransactions.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/test/testTransactions.py
@@ -27,7 +27,7 @@ class TestGetAllPkgInfo(unittest.TestCase):
if multilib:
self.allPkgs.append(["a%04d" % i, '1.0', '1', '', arch1])
self.allPkgs.append(["a%04d" % i, '1.0', '1', '', arch2])
- else:
+ else:
self.allPkgs.append(["a%04d" % i, '1.0', '1', '', arch1])
def setUp(self):
@@ -49,7 +49,7 @@ class TestTransactionData(unittest.TestCase):
self.packages1 = [(('kernel', '2.4.0', '1.0', ''), "u"),
(('blippy', '1.0', '1.0', '', 'i686'), "i")]
-
+
def testPopulateData1(self):
"Verify that populating data set 1 works correctly"
self.td.data['packages'] = self.packages1
@@ -70,7 +70,7 @@ class TestGenTransaction(unittest.TestCase):
self.packages1 = [(('kernel', '2.4.0', '1.0', ''), "u"),
(('blippy', '1.0', '1.0', '', 'i686'), "i")]
-
+
# def testGenTransactionData1(self):
# td = transaction.TransactionData()
# td.data['packages'] = self.packages1
@@ -83,12 +83,12 @@ class TestGenTransactionSat1(unittest.TestCase):
setupflag = 0
def _realSetup(self, testname):
rpm.addMacro("_dbpath",testutils.DBPATH)
- repackagedir = "/tmp/testrepackage"
+ repackagedir = "/tmp/testrepackage"
rpm.addMacro("_repackage_dir", repackagedir)
-
+
if TestGenTransactionSat1.setupflag != 0:
return
-
+
testutils.createDataDirs()
testutils.rebuildRpmDatabase(testname)
testutils.rebuildRepackageDir(testname)
@@ -107,12 +107,12 @@ class TestGenTransactionSat1(unittest.TestCase):
# self.packages1 = [(('kernel', '2.4.0', '1.0', ''), "u"),
# (('blippy', '1.0', '1.0', '', 'i686'), "i")]#
-
+
def tearDown(self):
pass
# testutils.restoreConfig()
-
+
# def testGenTransactionData1(self):
# td = transaction.TransactionData()
@@ -138,12 +138,12 @@ class TestActionsTransactions(unittest.TestCase):
setupflag = 0
def _realSetup(self, testname):
rpm.addMacro("_dbpath",testutils.DBPATH)
- repackagedir = "/tmp/testrepackage"
+ repackagedir = "/tmp/testrepackage"
rpm.addMacro("_repackage_dir", repackagedir)
-
+
if TestGenTransactionSat1.setupflag != 0:
return
-
+
testutils.createDataDirs()
testutils.rebuildRpmDatabase(testname)
testutils.rebuildRepackageDir(testname)
@@ -159,7 +159,7 @@ class TestActionsTransactions(unittest.TestCase):
def __setupData(self):
self.packages1 = [(('wget', '1.8.2', '5', ''), 'u'),
(('cvs', '1.11.2', '8', ''), 'u')]
-
+
def tearDown(self):
pass
@@ -169,7 +169,7 @@ class TestActionsTransactions(unittest.TestCase):
data = {}
data['packages'] = self.packages1
-
+
res = packages.runTransaction(data)
write(res)
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/test/testUp2dateAuth.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/test/testUp2dateAuth.py \
index 7d5a1e3..c199f96 100755
--- a/client/debian/packages-already-in-debian/rhn-client-tools/test/testUp2dateAuth.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/test/testUp2dateAuth.py
@@ -23,7 +23,7 @@ class TestGetSystemID(unittest.TestCase):
def tearDown(self):
self.cfg['systemIdPath'] = self.sysid
-
+
def testGetSystemId(self):
"Verify that the updateAuth.getSystemId can be called"
id = up2dateAuth.getSystemId()
@@ -35,7 +35,7 @@ class TestGetSystemID(unittest.TestCase):
id = up2dateAuth.getSystemId()
self.assertEqual(id, None)
-
+
class TestMaybeUpdateVersion(unittest.TestCase):
def setUp(self):
self.__setupData()
@@ -51,8 +51,8 @@ class TestMaybeUpdateVersion(unittest.TestCase):
import testutils
testutils.restoreConfig()
self.cfg['versionOverride'] = self.origversion
-
-
+
+
def testMaybeUpdateVersion(self):
"Verify that maybeUpdateVersion works"
ret = up2dateAuth.maybeUpdateVersion()
@@ -109,7 +109,7 @@ class TestLogin(unittest.TestCase):
else:
self.fail("Expected a dict containing headers, but the return is not a \
dict")
-
+
class TestUpdateLoginInfo(unittest.TestCase):
def setUp(self):
self.__setupData()
@@ -127,7 +127,7 @@ class TestUpdateLoginInfo(unittest.TestCase):
"test that up2dateAuth.up2dateLoginInfo works without exceptions"
ret = up2dateAuth.updateLoginInfo()
-
+
def testUpdateLoginInfoCredsType(self):
"Verify that up2dateAuth.updateLoginInfo returns login credentials in a \
dict" ret = up2dateAuth.updateLoginInfo()
@@ -139,7 +139,7 @@ class TestUpdateLoginInfo(unittest.TestCase):
def testUpdateLoginInfoSingleton(self):
"Verify that up2dateAuth.updateLoginInfo returns the proper auth info"
- # test for bugs #124335, #115385
+ # test for bugs #124335, #115385
ret1 = up2dateAuth.updateLoginInfo()
ret2 = up2dateAuth.updateLoginInfo()
assert ret1 == ret2
@@ -160,7 +160,7 @@ class TestUpdateLoginInfo(unittest.TestCase):
# if this doesn't throw an auth traceback, the auth doesnt work
p, t = rpcServer.doCall(rd.listPackages, channel,
msgCallback=None, progressCallback=None)
-
+
def testUp2dateLoginInfoWorks(self):
"Verify that up2dateAuth.updateLoginInfo retuns a working authToken"
@@ -168,7 +168,7 @@ class TestUpdateLoginInfo(unittest.TestCase):
rd = repoDirector.initRepoDirector()
ret2 = up2dateAuth.updateLoginInfo()
self.__verifyTokens(rd)
-
+
#TODO: things we don't test yet but need to
# authToken timeout (need some server magic)
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/test/testrhnregGui.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/test/testrhnregGui.py \
index befdae6..4e0a274 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/test/testrhnregGui.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/test/testrhnregGui.py
@@ -17,30 +17,30 @@ class MyError(Exception):
class TestcallAndFilterExceptions(unittest.TestCase):
def storeMessage(self, message, dummy):
self.message = message
-
+
def returnsNumber(self):
return 6
-
+
def raiseError(self):
raise MyError("I am a banana!")
-
+
def testCallableDoesntRaiseException(self):
- value = callAndFilterExceptions(self.returnsNumber, [], "Error",
+ value = callAndFilterExceptions(self.returnsNumber, [], "Error",
self.storeMessage)
self.assertEqual(value, 6)
-
+
def testCallableRaisesValidException(self):
self.assertRaises(MyError,
- callAndFilterExceptions, self.raiseError,
- [MyError], "Error",
+ callAndFilterExceptions, self.raiseError,
+ [MyError], "Error",
self.storeMessage)
def testCallableRaisesInvalidException(self):
- value = callAndFilterExceptions(self.raiseError, [], "Error3",
+ value = callAndFilterExceptions(self.raiseError, [], "Error3",
self.storeMessage)
self.assertEqual(value, None)
self.assertEqual(self.message, "Error3")
-
+
#TODO: things we don't test yet but need to
# authToken timeout (need some server magic)
# verifying that the authTokens we get actually work
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/test/testutils.py \
b/client/debian/packages-already-in-debian/rhn-client-tools/test/testutils.py index \
4845f2a..5bbc21b 100755
--- a/client/debian/packages-already-in-debian/rhn-client-tools/test/testutils.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/test/testutils.py
@@ -12,7 +12,7 @@ DBCACHEPATH="/tmp/testdbcaches/"
UP2DATE_COMMAND="up2date --justdb --dbpath $DBPATH"
DATAPATH="/tmp/datadir"
TOPDIR="../"
-DBDIR="%s/testdbs" % "/usr/src/rhn/test/up2date/depsolve/"
+DBDIR="%s/testdbs" % "/usr/src/rhn/test/up2date/depsolve/"
PKGDIR="%s/testpackages" % "/usr/src/rhn/test/up2date/rollbacks/"
RESULTSPATH="%s/results/" % (TOPDIR)
CONFIGPATH="%s/configs" % "/usr/src/rhn/test/up2date/depsolve/"
@@ -27,7 +27,7 @@ def createDbDir():
#whatever...
print "%s doesnt exist, creating it" % DBPATH
pass
-
+
# make the new
if not os.access(DBPATH, os.W_OK):
os.makedirs(DBPATH)
@@ -40,7 +40,7 @@ def createRepackageDir():
#whatever...
print "%s doesnt exist, creating it" % REPACKAGEDIR
pass
-
+
# make the new
if not os.access(REPACKAGEDIR, os.W_OK):
os.makedirs(REPACKAGEDIR)
@@ -50,7 +50,7 @@ def createRepackageDir():
def createDataDirs():
createDbDir()
createRepackageDir()
-
+
if not os.access(DATAPATH, os.W_OK):
os.makedirs(DATAPATH)
@@ -58,7 +58,7 @@ def createDataDirs():
def rebuildRepackageDir(repackageName):
createRepackageDir()
files = glob.glob("%s/%s/*.rpm" % (PKGDIR, repackageName))
- for file in files:
+ for file in files:
shutil.copy(file , REPACKAGEDIR)
@@ -83,7 +83,7 @@ def populateDbCache(dbname):
def rebuildRpmDatabase(dbname):
createDbDir()
-
+
if lookForDbCache(dbname):
print "Rebuilding rpm database"
shutil.copy("%s/%s/Packages" % (DBDIR,dbname) , DBPATH)
@@ -91,7 +91,7 @@ def rebuildRpmDatabase(dbname):
fd = os.popen(cmdline)
fd.read()
fd.close()
-
+
populateDbCache(dbname)
@@ -106,7 +106,7 @@ def getRpmQAList():
fd = os.popen(cmdline)
tmp = fd.readlines()
out = map(lambda a:string.strip(a), tmp)
-
+
fd.close()
return out
@@ -162,7 +162,7 @@ def logFailures(name):
fd = open("%s/FAILURES" % DATAPATH, "w+")
fd.write("%s\n" % name)
fd.close()
-
+
def runTestcase(testcase):
print "Generating an rpm db in %s based on %s" % (DBPATH, "%s/%s" % \
(DBDIR,testcase.dbname)) rebuildRpmDatabase(testcase.dbname)
@@ -218,7 +218,7 @@ def compareResults(resultsName, afterList):
resultsFile = "%s/%s" % (RESULTSPATH, resultsName)
if not os.access(resultsFile, os.R_OK):
raise "NoResultsError"
-
+
fd = open("%s/%s" % (RESULTSPATH, resultsName), "r")
expected = fd.readlines()
expected.sort()
@@ -233,10 +233,10 @@ def compareResults(resultsName, afterList):
else:
return 1
-
-
+
+
class Testcase:
def __init__(self, name=None, dbname=None,
configs=None, results=None, options=None):
@@ -253,14 +253,14 @@ class Testcase:
out = out + "results: %s" % self.results
out = out + "options: %s " % self.options
return out
-
+
testcases = []
testcasenames = []
def parsefile(m):
while 1:
s = m.readline()
if not len(s):
- break
+ break
s = s[:-1]
if not s:
continue
diff --git a/client/debian/packages-already-in-debian/rhnlib/rhn/SSL.py \
b/client/debian/packages-already-in-debian/rhnlib/rhn/SSL.py index ee9c693..f10865c \
100644
--- a/client/debian/packages-already-in-debian/rhnlib/rhn/SSL.py
+++ b/client/debian/packages-already-in-debian/rhnlib/rhn/SSL.py
@@ -29,7 +29,7 @@ class SSLSocket:
def __init__(self, socket, trusted_certs=None):
# SSL.Context object
self._ctx = None
- # SSL.Connection object
+ # SSL.Connection object
self._connection = None
self._sock = socket
self._trusted_certs = []
@@ -40,7 +40,7 @@ class SSLSocket:
# SSL method to use
self._ssl_method = SSL.SSLv23_METHOD
# Flags to pass to the SSL layer
- self._ssl_verify_flags = SSL.VERIFY_PEER
+ self._ssl_verify_flags = SSL.VERIFY_PEER
# Buffer size for reads
self._buffer_size = 8192
@@ -82,7 +82,7 @@ class SSLSocket:
self._ctx.set_verify(self._ssl_verify_flags, ssl_verify_callback)
if hasattr(SSL, "OP_DONT_INSERT_EMPTY_FRAGMENTS"):
# Certain SSL implementations break when empty fragments are
- # initially sent (even if sending them is compliant to
+ # initially sent (even if sending them is compliant to
# SSL 3.0 and TLS 1.0 specs). Play it safe and disable this
# feature (openssl 0.9.6e and later)
self._ctx.set_options(SSL.OP_DONT_INSERT_EMPTY_FRAGMENTS)
@@ -104,7 +104,7 @@ class SSLSocket:
# that originally called makefile() are gone
self._makefile_called = self._makefile_called + 1
return self
-
+
def close(self):
"""
Closes the SSL connection
@@ -167,7 +167,7 @@ class SSLSocket:
try:
data = self._connection.recv(buffer_size)
-
+
self._buffer = self._buffer + data
buffer_length = len(self._buffer)
@@ -209,8 +209,8 @@ class SSLSocket:
Writes to the SSL connection.
"""
self._check_closed()
-
- # XXX Should use sendall
+
+ # XXX Should use sendall
# sent = self._connection.sendall(data)
origlen = len(data)
while True:
@@ -223,7 +223,7 @@ class SSLSocket:
self._poll(select.POLLOUT, 'write')
except SSL.WantReadError:
self._poll(select.POLLIN, 'write')
-
+
return origlen
def recv(self, amt):
@@ -289,7 +289,7 @@ def ssl_verify_callback(conn, cert, errnum, depth, ok):
return ok
class TimeoutException(SSL.Error, socket.timeout):
-
+
def __init__(self, *args):
self.args = args
diff --git a/client/debian/packages-already-in-debian/rhnlib/rhn/SmartIO.py \
b/client/debian/packages-already-in-debian/rhnlib/rhn/SmartIO.py index \
c64def4..03c02af 100644
--- a/client/debian/packages-already-in-debian/rhnlib/rhn/SmartIO.py
+++ b/client/debian/packages-already-in-debian/rhnlib/rhn/SmartIO.py
@@ -76,7 +76,7 @@ def getDefaultStorage():
except IOError:
return tmpdir
for line in f.readlines():
- if line.startswith("tmpDir="):
+ if line.startswith("tmpDir="):
cfgdir = line.split("=")
if len(cfgdir) > 1:
tmpdir = cfgdir[-1].strip() or tmpdir
diff --git a/client/debian/packages-already-in-debian/rhnlib/rhn/UserDictCase.py \
b/client/debian/packages-already-in-debian/rhnlib/rhn/UserDictCase.py index \
c58e8c2..8fd4a35 100644
--- a/client/debian/packages-already-in-debian/rhnlib/rhn/UserDictCase.py
+++ b/client/debian/packages-already-in-debian/rhnlib/rhn/UserDictCase.py
@@ -43,7 +43,7 @@ class UserDictCase(UserDict):
key = self.__lower_string(key)
if not self.data.has_key(key):
return None
- return self.data[key]
+ return self.data[key]
get = __getitem__
@@ -64,13 +64,13 @@ class UserDictCase(UserDict):
def clear(self):
self.data.clear()
- self.kcase.clear()
+ self.kcase.clear()
# return this data as a real hash
def get_hash(self):
return reduce(lambda a, (ik, v), hc=self.kcase:
a.update({ hc[ik] : v}) or a, self.data.items(), {})
-
+
# return the data for marshalling
def __getstate__(self):
return self.get_hash()
diff --git a/client/debian/packages-already-in-debian/rhnlib/rhn/__init__.py \
b/client/debian/packages-already-in-debian/rhnlib/rhn/__init__.py index \
f991867..d5f66ae 100644
--- a/client/debian/packages-already-in-debian/rhnlib/rhn/__init__.py
+++ b/client/debian/packages-already-in-debian/rhnlib/rhn/__init__.py
@@ -2,7 +2,7 @@
# __init__.py
#
# Copyright (c) 2011--2013 Red Hat, Inc.
-#
+#
"""
rhn - A collection of modules used by Red Hat Network
"""
diff --git a/client/debian/packages-already-in-debian/rhnlib/rhn/connections.py \
b/client/debian/packages-already-in-debian/rhnlib/rhn/connections.py index \
a901a8b..0fe65b6 100644
--- a/client/debian/packages-already-in-debian/rhnlib/rhn/connections.py
+++ b/client/debian/packages-already-in-debian/rhnlib/rhn/connections.py
@@ -28,7 +28,7 @@ class HTTPResponse(httplib.HTTPResponse):
class HTTPConnection(httplib.HTTPConnection):
response_class = HTTPResponse
-
+
def __init__(self, host, port=None):
if python_version() >= '2.6.1':
httplib.HTTPConnection.__init__(self, host, port, \
timeout=SSL.DEFAULT_TIMEOUT) @@ -84,7 +84,7 @@ class \
HTTPConnection(httplib.HTTPConnection): response = self.response_class(self.sock, \
self.debuglevel) else:
response = self.response_class(self.sock)
-
+
# The only modification compared to the stock HTTPConnection
if self._cb_callback:
response.set_callback(self._cb_rs, self._cb_ws, self._cb_ex,
@@ -135,7 +135,7 @@ class HTTPProxyConnection(HTTPConnection):
HTTPConnection.putrequest(self, method, newurl, skip_host=skip_host)
# Add proxy-specific headers
self._add_proxy_headers()
-
+
def _add_proxy_headers(self):
if not self.__username:
return
@@ -143,7 +143,7 @@ class HTTPProxyConnection(HTTPConnection):
userpass = "%s:%s" % (self.__username, self.__password)
enc_userpass = base64.encodestring(userpass).replace("\n", "")
self.putheader("Proxy-Authorization", "Basic %s" % enc_userpass)
-
+
class HTTPSConnection(HTTPConnection):
response_class = HTTPResponse
default_port = httplib.HTTPSConnection.default_port
@@ -190,7 +190,7 @@ class HTTPSProxyResponse(HTTPResponse):
class HTTPSProxyConnection(HTTPProxyConnection):
default_port = HTTPSConnection.default_port
- def __init__(self, proxy, host, port=None, username=None, password=None,
+ def __init__(self, proxy, host, port=None, username=None, password=None,
trusted_certs=None):
HTTPProxyConnection.__init__(self, proxy, host, port, username, password)
trusted_certs = trusted_certs or []
@@ -199,7 +199,7 @@ class HTTPSProxyConnection(HTTPProxyConnection):
def connect(self):
# Set the connection with the proxy
HTTPProxyConnection.connect(self)
- # Use the stock HTTPConnection putrequest
+ # Use the stock HTTPConnection putrequest
host = "%s:%s" % (self._host, self._port)
HTTPConnection.putrequest(self, "CONNECT", host)
# Add proxy-specific stuff
@@ -209,7 +209,7 @@ class HTTPSProxyConnection(HTTPProxyConnection):
# Save the response class
response_class = self.response_class
# And replace the response class with our own one, which does not
- # close the connection after
+ # close the connection after
self.response_class = HTTPSProxyResponse
response = HTTPConnection.getresponse(self)
# Restore the response class
diff --git a/client/debian/packages-already-in-debian/rhnlib/rhn/nonblocking.py \
b/client/debian/packages-already-in-debian/rhnlib/rhn/nonblocking.py index \
0d84cce..5c2abaf 100644
--- a/client/debian/packages-already-in-debian/rhnlib/rhn/nonblocking.py
+++ b/client/debian/packages-already-in-debian/rhnlib/rhn/nonblocking.py
@@ -19,13 +19,13 @@ class NonBlockingFile:
self.user_data = None
self.callback = None
- def set_callback(self, read_fd_set, write_fd_set, exc_fd_set,
+ def set_callback(self, read_fd_set, write_fd_set, exc_fd_set,
user_data, callback):
self.read_fd_set = read_fd_set
# Make the objects non-blocking
for f in self.read_fd_set:
fcntl.fcntl(f.fileno(), fcntl.F_SETFL, os.O_NDELAY)
-
+
self.write_fd_set = write_fd_set
self.exc_fd_set = exc_fd_set
self.user_data = user_data
diff --git a/client/debian/packages-already-in-debian/rhnlib/rhn/rpclib.py \
b/client/debian/packages-already-in-debian/rhnlib/rhn/rpclib.py index \
94725e7..abdfad7 100644
--- a/client/debian/packages-already-in-debian/rhnlib/rhn/rpclib.py
+++ b/client/debian/packages-already-in-debian/rhnlib/rhn/rpclib.py
@@ -75,7 +75,7 @@ def split_host(hoststring):
host = arr[0]
if len(arr) == 2:
port = arr[1]
-
+
return (host, port, user, passwd)
def get_proxy_info(proxy):
@@ -86,9 +86,9 @@ def get_proxy_info(proxy):
if len(arr) == 2:
# scheme found, strip it
proxy = arr[1]
-
+
return split_host(proxy)
-
+
class MalformedURIError(IOError):
pass
@@ -126,7 +126,7 @@ class Server:
_transport_class_https = transports.SafeTransport
_transport_class_proxy = transports.ProxyTransport
_transport_class_https_proxy = transports.SafeProxyTransport
- def __init__(self, uri, transport=None, encoding=None, verbose=0,
+ def __init__(self, uri, transport=None, encoding=None, verbose=0,
proxy=None, username=None, password=None, refreshCallback=None,
progressCallback=None):
# establish a "logical" server connection
@@ -149,7 +149,7 @@ class Server:
if pw is not None and password is None:
password = pw
-
+
self._uri = uri
self._refreshCallback = None
self._progressCallback = None
@@ -174,7 +174,7 @@ class Server:
# set up independantly
#
self._allow_redirect = 0
-
+
self._redirected = None
self.use_handler_path = 1
self._transport = transport
@@ -196,10 +196,10 @@ class Server:
def default_transport(self, type, proxy=None, username=None, password=None):
if proxy:
if type == 'https':
- transport = self._transport_class_https_proxy(proxy,
+ transport = self._transport_class_https_proxy(proxy,
proxyUsername=username, proxyPassword=password)
else:
- transport = self._transport_class_proxy(proxy,
+ transport = self._transport_class_proxy(proxy,
proxyUsername=username, proxyPassword=password)
else:
if type == 'https':
@@ -339,7 +339,7 @@ class Server:
return tuple(result)
def _request(self, methodname, params):
- """ Call a method on the remote server
+ """ Call a method on the remote server
we can handle redirections. """
# the loop is used to handle redirections
redirect_response = 0
@@ -358,11 +358,11 @@ class Server:
self._transport.set_header(k, v)
self._transport.add_header("X-Info",
- 'RPC Processor (C) Red Hat, Inc (version %s)' %
+ 'RPC Processor (C) Red Hat, Inc (version %s)' %
self.rpc_version)
# identify the capability set of this client to the server
self._transport.set_header("X-Client-Version", 1)
-
+
if self._allow_redirect:
# Advertise that we follow redirects
#changing the version from 1 to 2 to support backward compatibility
@@ -402,12 +402,12 @@ class Server:
if not self._allow_redirect:
raise InvalidRedirectionError("Redirects not allowed")
-
+
if self._verbose:
print "%s redirected to %s" % (self._uri, self._redirected)
typ, uri = urllib.splittype(self._redirected)
-
+
if typ != None:
typ = typ.lower()
if typ not in ("http", "https"):
@@ -446,7 +446,7 @@ class Server:
if isinstance(response, transports.File):
# Just return the file
return response
-
+
# an XML-RPC encoded data structure
if isinstance(response, TupleType) and len(response) == 1:
response = response[0]
@@ -510,7 +510,7 @@ class Server:
self._lang = lang
if self._transport and hasattr(self._transport, "setlang"):
self._transport.setlang(lang)
-
+
# Sets the CA chain to be used
def use_CA_chain(self, ca_chain = None):
raise NotImplementedError, "This method is deprecated"
@@ -519,7 +519,7 @@ class Server:
self._trusted_cert_files.append(certfile)
if self._transport and hasattr(self._transport, "add_trusted_cert"):
self._transport.add_trusted_cert(certfile)
-
+
def close(self):
if self._transport:
self._transport.close()
@@ -564,7 +564,7 @@ class GETServer(Server):
def __init__(self, uri, transport=None, proxy=None, username=None,
password=None, client_version=2, headers={}, refreshCallback=None,
progressCallback=None):
- Server.__init__(self, uri,
+ Server.__init__(self, uri,
proxy=proxy,
username=username,
password=password,
@@ -589,12 +589,12 @@ class GETServer(Server):
#save the constructed handler in case of redirect
self.send_handler = self._handler
-
+
# Add headers
#override the handler to replace /XMLRPC with pkg path
if self._redirected and not self.use_handler_path:
self._handler = self._new_req_body()
-
+
for h, v in self._headers.items():
self._transport.set_header(h, v)
@@ -618,7 +618,7 @@ class GETServer(Server):
type, tmpuri = urllib.splittype(self._redirected)
site, handler = urllib.splithost(tmpuri)
return handler
-
+
def set_range(self, offset=None, amount=None):
if offset is not None:
try:
@@ -636,7 +636,7 @@ class GETServer(Server):
if amount <= 0:
raise RangeError("Invalid value `%s' for amount" % amount)
-
+
self._amount = amount
self._offset = offset
@@ -665,7 +665,7 @@ def getHeaderValues(headers, name):
return [headers[name]]
return []
- return map(lambda x: x.split(':', 1)[1].strip(),
+ return map(lambda x: x.split(':', 1)[1].strip(),
headers.getallmatchingheaders(name))
class _Method:
@@ -700,7 +700,7 @@ class SlicingMethod(_Method):
self._offset = kwargs.get('offset')
self._amount = kwargs.get('amount')
- # im_self is a pointer to self, so we can modify the class underneath
+ # im_self is a pointer to self, so we can modify the class underneath
try:
self._send.im_self.set_range(offset=self._offset,
amount=self._amount)
@@ -716,7 +716,7 @@ class SlicingMethod(_Method):
pass
return result
-
+
def reportError(headers):
""" Reports the error from the headers. """
diff --git a/client/debian/packages-already-in-debian/rhnlib/rhn/transports.py \
b/client/debian/packages-already-in-debian/rhnlib/rhn/transports.py index \
96f8e19..e3194e4 100644
--- a/client/debian/packages-already-in-debian/rhnlib/rhn/transports.py
+++ b/client/debian/packages-already-in-debian/rhnlib/rhn/transports.py
@@ -5,7 +5,7 @@
#
# Author: Mihai Ibanescu <misa@redhat.com>
# Based on what was previously shipped as cgiwrap:
-# - Cristian Gafton <gafton@redhat.com>
+# - Cristian Gafton <gafton@redhat.com>
# - Erik Troan <ewt@redhat.com>
# $Id$
@@ -62,7 +62,7 @@ class Transport(xmlrpclib.Transport):
self.refreshCallback = refreshCallback
# set the buffer size
- # The bigger this is, the faster the read is, but the more seldom is the
+ # The bigger this is, the faster the read is, but the more seldom is the
# progress callback called
def set_buffer_size(self, bufferSize):
if bufferSize is None:
@@ -76,7 +76,7 @@ class Transport(xmlrpclib.Transport):
if method not in ("GET", "POST"):
raise IOError, "Unknown request method %s" % method
self.method = method
-
+
# reset the transport options
def set_transport_flags(self, transfer=None, encoding=None, **kwargs):
# For backwards compatibility, we keep transfer and encoding as
@@ -126,15 +126,15 @@ class Transport(xmlrpclib.Transport):
if self.verbose:
print "Connecting via http to %s" % (host, )
return connections.HTTPConnection(host)
-
+
def request(self, host, handler, request_body, verbose=0):
# issue XML-RPC request
# XXX: automatically compute how to send depending on how much data
# you want to send
-
+
# XXX Deal with HTTP/1.1 if necessary
self.verbose = verbose
-
+
# implement BASIC HTTP AUTHENTICATION
host, extra_headers, x509 = self.get_host_info(host)
if not extra_headers:
@@ -163,9 +163,9 @@ class Transport(xmlrpclib.Transport):
# Host and Content-Length are set by HTTP*Connection
for h in ['Content-Length', 'Host']:
req.clear_header(h)
-
+
headers, fd = req.send_http(host, handler)
-
+
if self.verbose:
print "Incoming headers:"
for header, value in headers.items():
@@ -187,9 +187,9 @@ class Transport(xmlrpclib.Transport):
# Now use the Input class in case we get an enhanced response
resp = Input(self.headers_in, progressCallback=self.progressCallback,
bufferSize=self.bufferSize)
-
+
fd = resp.decode(fd)
-
+
if isinstance(fd, InputStream):
# When the File object goes out of scope, so will the InputStream;
# that will eventually call the connection's close() method and
@@ -235,14 +235,14 @@ class Transport(xmlrpclib.Transport):
p.close()
return u.close()
-
+
def setlang(self, lang):
self._lang = lang
class SafeTransport(Transport):
def __init__(self, transfer=0, encoding=0, refreshCallback=None,
progressCallback=None, trusted_certs=None):
- Transport.__init__(self, transfer, encoding,
+ Transport.__init__(self, transfer, encoding,
refreshCallback=refreshCallback, progressCallback=progressCallback)
self.trusted_certs = []
for certfile in (trusted_certs or []):
@@ -274,16 +274,16 @@ class ProxyTransport(Transport):
if self.verbose:
print "Connecting via http to %s proxy %s, username %s, pass %s" % (
host, self._proxy, self._proxy_username, self._proxy_password)
- return connections.HTTPProxyConnection(self._proxy, host,
+ return connections.HTTPProxyConnection(self._proxy, host,
username=self._proxy_username, password=self._proxy_password)
class SafeProxyTransport(ProxyTransport):
def __init__(self, proxy, proxyUsername=None, proxyPassword=None,
transfer=0, encoding=0, refreshCallback=None,
progressCallback=None, trusted_certs=None):
- ProxyTransport.__init__(self, proxy,
+ ProxyTransport.__init__(self, proxy,
proxyUsername=proxyUsername, proxyPassword=proxyPassword,
- transfer=transfer, encoding=encoding,
+ transfer=transfer, encoding=encoding,
refreshCallback=refreshCallback,
progressCallback=progressCallback)
self.trusted_certs = []
@@ -299,8 +299,8 @@ class SafeProxyTransport(ProxyTransport):
if self.verbose:
print "Connecting via https to %s proxy %s, username %s, pass %s" % (
host, self._proxy, self._proxy_username, self._proxy_password)
- return connections.HTTPSProxyConnection(self._proxy, host,
- username=self._proxy_username, password=self._proxy_password,
+ return connections.HTTPSProxyConnection(self._proxy, host,
+ username=self._proxy_username, password=self._proxy_password,
trusted_certs=self.trusted_certs)
# ===========================================================================@@ \
-339,7 +339,7 @@ class Input: self.progressCallback = progressCallback
self.bufferSize = bufferSize
self.max_mem_size = max_mem_size
-
+
if not headers:
# we need to get them from environment
if os.environ.has_key("HTTP_CONTENT_TRANSFER_ENCODING"):
@@ -381,17 +381,17 @@ class Input:
self.lang = value.lower()
elif h == "x-package-filename":
self.name = value
-
+
self.io = None
-
+
def read(self, fd = sys.stdin):
# The octet-streams are passed right back
if self.type == "application/octet-stream":
return
-
+
if self.length:
# Read exactly the amount of data we were told
- self.io = _smart_read(fd, self.length,
+ self.io = _smart_read(fd, self.length,
bufferSize=self.bufferSize,
progressCallback=self.progressCallback,
max_mem_size=self.max_mem_size)
@@ -414,7 +414,7 @@ class Input:
# The octet-stream data are passed right back
if self.type == "application/octet-stream":
return InputStream(fd, self.length, self.name, closeý.close)
-
+
if not self.io:
self.read(fd)
@@ -448,7 +448,7 @@ class Input:
self.length = len(data)
self.io = SmartIO(max_mem_size=self.max_mem_size)
self.io.write(data)
- elif self.encoding == "x-gpg":
+ elif self.encoding == "x-gpg":
# XXX: should be written
raise NotImplementedError(self.transfer, self.encoding)
else:
@@ -457,11 +457,11 @@ class Input:
# Play nicely and rewind the file descriptor
self.io.seek(0, 0)
return self.io
-
+
def getlang(self):
return self.lang
-# Utility functions
+# Utility functions
def _smart_total_read(fd, bufferSize24, max_mem_size384):
"""
@@ -490,14 +490,14 @@ def _smart_read(fd, amt, bufferSize24, progressCallback=None,
# Unlike read(), _smart_read tries to return exactly the requested amount
# (whereas read will return _up_to_ that amount). Reads from sockets will
# usually reaturn less data, or the read can be interrupted
- #
+ #
# Inspired by Greg Stein's httplib.py (the standard in python 2.x)
#
# support for progress callbacks added
startTime = time.time()
lastTime = startTime
buf = SmartIO(max_mem_size=max_mem_size)
-
+
origsize = amt
while amt > 0:
curTime = time.time()
@@ -522,7 +522,7 @@ def _smart_read(fd, amt, bufferSize24, progressCallback=None,
lastTime = curTime
# use float() so that we force float division in the next step
bytesRead = float(origsize - amt)
- # if amt == 0, on a fast machine it is possible to have
+ # if amt == 0, on a fast machine it is possible to have
# curTime - lastTime == 0, so add an epsilon to prevent a division
# by zero
speed = bytesRead / ((curTime - startTime) + .000001)
@@ -534,7 +534,7 @@ def _smart_read(fd, amt, bufferSize24, progressCallback=None,
# of 0 length; but that's impossible since we already checked
# that l is non-null
secs = amt / speed
- progressCallback(bytesRead, origsize, speed, secs)
+ progressCallback(bytesRead, origsize, speed, secs)
# Now rewind the SmartIO
buf.seek(0, 0)
@@ -554,13 +554,13 @@ class InputStream:
# =========================================================================== # \
Output class that will be used to build the temporary output string class \
BaseOutput:
- # DEFINES for instances use
+ # DEFINES for instances use
# Content-Encoding
ENCODE_NONE = 0
ENCODE_GZIP = 1
ENCODE_ZLIB = 2
ENCODE_GPG = 3
-
+
# Content-Transfer-Encoding
TRANSFER_NONE = 0
TRANSFER_BINARY = 1
@@ -608,7 +608,7 @@ class BaseOutput:
# internal flags
self.__processed = 0
-
+
def set_header(self, name, arg):
if type(arg) in [ type([]), type(()) ]:
# Multi-valued header
@@ -668,7 +668,7 @@ class BaseOutput:
self.set_header("Content-Transfer-Encoding", transfer_name)
self.set_header("Content-Type", "text/base64")
self.data = base64.encodestring(self.data)
-
+
self.set_header("Content-Length", len(self.data))
rpc_version = __version__
@@ -677,10 +677,10 @@ class BaseOutput:
# other headers
self.set_header("X-Transport-Info",
- 'Extended Capabilities Transport (C) Red Hat, Inc (version %s)' %
+ 'Extended Capabilities Transport (C) Red Hat, Inc (version %s)' %
rpc_version)
self.__processed = 1
-
+
# reset the transport options
def set_transport_flags(self, transfer=0, encoding=0, **kwargs):
self.transfer = transfer
@@ -696,16 +696,16 @@ class BaseOutput:
if self._connection is None:
raise Exception("No connection object found")
self._connection.connect()
- self._connection.request(self.method, handler, body=self.data,
+ self._connection.request(self.method, handler, body=self.data,
headers=self.headers)
-
+
response = self._connection.getresponse()
if not self.response_acceptable(response):
- raise xmlrpclib.ProtocolError("%s %s" %
+ raise xmlrpclib.ProtocolError("%s %s" %
(self._host, handler),
response.status, response.reason, response.msg)
-
+
# A response object has read() and close() methods, so we can safely
# pass the whole object back
return response.msg, response
@@ -802,13 +802,13 @@ class File:
break
file.write(buf)
return file
-
+
def _get_file(self):
"""Read everything into a temporary file and call the progress
callbacks if the file length is defined, or just reads till EOF"""
if self.length:
io = _smart_read(self.file_obj, self.length,
- bufferSize=self.bufferSize,
+ bufferSize=self.bufferSize,
progressCallback=self.progressCallback)
io.seek(0, 0)
else:
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/00-connection.py \
b/client/debian/packages-already-in-debian/rhnlib/test/00-connection.py index \
907a3d5..7e13b8f 100755
--- a/client/debian/packages-already-in-debian/rhnlib/test/00-connection.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/00-connection.py
@@ -45,7 +45,7 @@ def get_test_server_http():
global SERVER, HANDLER
return Server("http://%s%s" % (SERVER, HANDLER))
-
+
if __name__ == '__main__':
systemid = open(system_id_file).read()
@@ -59,5 +59,5 @@ if __name__ == '__main__':
s = gs()
print "--- %s ---" % gs
print s.up2date.login(systemid)
-
+
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/02-callbacks.py \
b/client/debian/packages-already-in-debian/rhnlib/test/02-callbacks.py index \
009ce0c..bf7d3a5 100755
--- a/client/debian/packages-already-in-debian/rhnlib/test/02-callbacks.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/02-callbacks.py
@@ -39,7 +39,7 @@ if __name__ == '__main__':
channels = dict['X-RHN-Auth-Channels']
cn, cv = channels[0][:2]
-
+
print "Calling listPackages"
l = gs.listPackages(cn, cv)
for p in l:
@@ -48,7 +48,7 @@ if __name__ == '__main__':
break
else:
raise Exception("Package not found")
-
+
print "PACKAGE TO DOWNLOAD: %s %s %s %s" % (package[0], package[1], package[2], \
package[4])
filename = "%s-%s-%s.%s.rpm" % (package[0], package[1], package[2], package[4])
print "Calling getPackages"
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/03-nonblocking.py \
b/client/debian/packages-already-in-debian/rhnlib/test/03-nonblocking.py index \
11bd243..93961ab 100644
--- a/client/debian/packages-already-in-debian/rhnlib/test/03-nonblocking.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/03-nonblocking.py
@@ -1,7 +1,7 @@
import socket
import sys
sys.path.append('..')
-from rhn.connections import HTTPConnection
+from rhn.connections import HTTPConnection
def callback(r, w, x, u):
print "Callback called"
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/04-authenticated-proxy.py \
b/client/debian/packages-already-in-debian/rhnlib/test/04-authenticated-proxy.py \
index 4e0446b..ba1e40b 100755
--- a/client/debian/packages-already-in-debian/rhnlib/test/04-authenticated-proxy.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/04-authenticated-proxy.py
@@ -2,7 +2,7 @@
#
#
#
-# $Id$
+# $Id$
#
# Usage: $0 SERVER PROXY:PORT [SYSTEMID] [PROXY_USER] [PROXY_PASS]
@@ -18,7 +18,7 @@ PROXY_USERNAME = None
PROXY_PASSWORD = None
system_id_file = '/etc/sysconfig/rhn/systemid'
-if len(sys.argv) < 3:
+if len(sys.argv) < 3:
print "Non efficient cmd-line arguments! Provide at least server & proxy!"
sys.exit(1);
@@ -43,7 +43,7 @@ def get_test_server_proxy_https():
return Server("https://%s%s" % (SERVER, HANDLER), proxy=PROXY,
username=PROXY_USERNAME, password=PROXY_PASSWORD)
-
+
if __name__ == '__main__':
systemid = open(system_id_file).read()
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/05-delete-packages.py \
b/client/debian/packages-already-in-debian/rhnlib/test/05-delete-packages.py index \
2aaf081..887e871 100644
--- a/client/debian/packages-already-in-debian/rhnlib/test/05-delete-packages.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/05-delete-packages.py
@@ -39,4 +39,4 @@ if __name__ == '__main__':
result = s.registration.delete_packages(systemid, packages[:1000]);
sys.exit(result);
-
+
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/07-leaking-ssl-fd.py \
b/client/debian/packages-already-in-debian/rhnlib/test/07-leaking-ssl-fd.py index \
89b48e5..3561041 100644
--- a/client/debian/packages-already-in-debian/rhnlib/test/07-leaking-ssl-fd.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/07-leaking-ssl-fd.py
@@ -32,7 +32,7 @@ class makeAttempts(Thread):
def run(self):
global system_id_file
systemid = open(system_id_file).read()
-
+
dict = self.server.up2date.login(systemid)
channels = dict['X-RHN-Auth-Channels']
c = channels[0]
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/10-tempfile.py \
b/client/debian/packages-already-in-debian/rhnlib/test/10-tempfile.py index \
58326c1..f088c0e 100755
--- a/client/debian/packages-already-in-debian/rhnlib/test/10-tempfile.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/10-tempfile.py
@@ -43,7 +43,7 @@ if __name__ == '__main__':
failed = True;
del ret
-
+
print "Running without saving object references"
for i in range(1000):
print "Running", i
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/12-Input-Output.py \
b/client/debian/packages-already-in-debian/rhnlib/test/12-Input-Output.py index \
6db672c..9ebef25 100644
--- a/client/debian/packages-already-in-debian/rhnlib/test/12-Input-Output.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/12-Input-Output.py
@@ -29,6 +29,6 @@ if __name__ == '__main__':
for transfer in range(3):
for encoding in range(3):
tests.append((transfer, encoding))
-
+
for test in tests:
t(test[0], test[1])
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/13-safe_read.py \
b/client/debian/packages-already-in-debian/rhnlib/test/13-safe_read.py index \
0b4bc49..1ec7c09 100755
--- a/client/debian/packages-already-in-debian/rhnlib/test/13-safe_read.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/13-safe_read.py
@@ -20,7 +20,7 @@ class SlowSocket:
def read(self, amt=None):
time.sleep(.01)
return self._buf.read(amt)
-
+
def __getattr__(self, name):
return getattr(self._buf, name)
@@ -48,7 +48,7 @@ def openedFiles():
global pid
path = '/proc/' + pid + '/fd/';
return len(glob.glob(os.path.join(path, '*')));
-
+
if __name__ == '__main__':
global pid
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/14-Input-Output.py \
b/client/debian/packages-already-in-debian/rhnlib/test/14-Input-Output.py index \
454fad4..42be61c 100644
--- a/client/debian/packages-already-in-debian/rhnlib/test/14-Input-Output.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/14-Input-Output.py
@@ -7,7 +7,7 @@
# 2004-11-29: fails, but it looks like it never worked. Need to investigate
import string
-import sys
+import sys
sys.path.append('..')
from rhn import transports
import xmlrpclib
@@ -63,7 +63,7 @@ if __name__ == '__main__':
for transfer in range(3):
for encoding in range(3):
tests.append((transfer, encoding))
-
+
for test in tests:
test_xmlrpc(test[0], test[1])
test_blob(test[0], test[1])
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/15-ranges.py \
b/client/debian/packages-already-in-debian/rhnlib/test/15-ranges.py index \
ea4447d..dc69136 100644
--- a/client/debian/packages-already-in-debian/rhnlib/test/15-ranges.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/15-ranges.py
@@ -4,7 +4,7 @@
#
# $Id$
-import sys
+import sys
sys.path.append('..')
from rhn import rpclib
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/16-test-ranges.py \
b/client/debian/packages-already-in-debian/rhnlib/test/16-test-ranges.py index \
0e06f6a..9a4238f 100644
--- a/client/debian/packages-already-in-debian/rhnlib/test/16-test-ranges.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/16-test-ranges.py
@@ -4,7 +4,7 @@
#
# $Id$
-import sys
+import sys
sys.path.append('..')
from rhn import rpclib
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/19-redirects.py \
b/client/debian/packages-already-in-debian/rhnlib/test/19-redirects.py index \
12cbd69..dd72eab 100755
--- a/client/debian/packages-already-in-debian/rhnlib/test/19-redirects.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/19-redirects.py
@@ -49,7 +49,7 @@ def main():
def run_test(url, allow_redirect, should_fail, text_message):
global SYSTEM_ID
-
+
message = "Running test: %s" % text_message
print message,
@@ -73,7 +73,7 @@ def run_test(url, allow_redirect, should_fail, text_message):
print "PASS"
return 0
-
+
if __name__ == '__main__':
sys.exit(main() or 0)
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/20-proxy-user-agent.py \
b/client/debian/packages-already-in-debian/rhnlib/test/20-proxy-user-agent.py index \
03274b3..155c662 100755
--- a/client/debian/packages-already-in-debian/rhnlib/test/20-proxy-user-agent.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/20-proxy-user-agent.py
@@ -4,7 +4,7 @@
#
# $Id$
#
-# Usage: $0 SERVER PROXY
+# Usage: $0 SERVER PROXY
import sys
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/23-digest-auth.py \
b/client/debian/packages-already-in-debian/rhnlib/test/23-digest-auth.py index \
9310191..6eb3eb7 100755
--- a/client/debian/packages-already-in-debian/rhnlib/test/23-digest-auth.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/23-digest-auth.py
@@ -9,7 +9,7 @@
# Few notes about what is done here:
# - thread AUTH sends authentication digest
# - thread NC uses netcat and grep to see results
-# - Little hack with (echo -n) is much more easier to use,
+# - Little hack with (echo -n) is much more easier to use,
# than some settrace machinary
import sys
@@ -71,7 +71,7 @@ def authenticate():
except socket.error, e:
# nobody is listenning, try to authenticate again
connected = False;
- pass;
+ pass;
except httplib.BadStatusLine, e:
# This is ok, netcat does not send apropriate response
pass
@@ -92,7 +92,7 @@ if __name__ == '__main__':
global nc, auth
nc = killable(target = netcat);
auth = killable(target = authenticate);
-
+
nc.start();
auth.start();
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/24-ssl-memleak.py \
b/client/debian/packages-already-in-debian/rhnlib/test/24-ssl-memleak.py index \
6f59dc9..036a19f 100755
--- a/client/debian/packages-already-in-debian/rhnlib/test/24-ssl-memleak.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/24-ssl-memleak.py
@@ -19,7 +19,7 @@ def main():
ca_cert = sys.argv[2]
except:
pass
- server_url = "https://" + server_name + "/APPLET"
+ server_url = "https://" + server_name + "/APPLET"
mem_usage = None
mem_usage_VmSize_max = None
@@ -53,7 +53,7 @@ def run_test(server_url, ca_cert):
s.add_trusted_cert(ca_cert)
status = s.applet.poll_status()
-
+
def mem_usage():
f = open("/proc/self/status")
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/25-ssl-memleak.py \
b/client/debian/packages-already-in-debian/rhnlib/test/25-ssl-memleak.py index \
f30dc2f..5859fd6 100644
--- a/client/debian/packages-already-in-debian/rhnlib/test/25-ssl-memleak.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/25-ssl-memleak.py
@@ -42,7 +42,7 @@ def main():
print "Test PASSES"
return 0
-
+
def run_test(server_name, server_port, ca_cert):
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/26-ssl-bad-cert.py \
b/client/debian/packages-already-in-debian/rhnlib/test/26-ssl-bad-cert.py index \
2a672f8..bd87a28 100644
--- a/client/debian/packages-already-in-debian/rhnlib/test/26-ssl-bad-cert.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/26-ssl-bad-cert.py
@@ -14,7 +14,7 @@ def main():
server_name = "www.redhat.com"
server_port = 443
ca_cert = "/usr/share/rhn/RHNS-CA-CERT"
-
+
try:
run_test(server_name, server_port, ca_cert)
except SSL.SSL.Error, e:
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/__init__.py \
b/client/debian/packages-already-in-debian/rhnlib/test/__init__.py index \
67e4631..65b74ff 100644
--- a/client/debian/packages-already-in-debian/rhnlib/test/__init__.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/__init__.py
@@ -4,12 +4,12 @@ import test_server
def testSuite():
suite = unittest.TestSuite()
loader = unittest.TestLoader()
-
+
"""
def testModule(module):
import module
suite.addTests(loader.loadTestsFromModule(module))
-
+
"""
suite.addTest(loader.loadTestsFromModule(test_server))
return suite
diff --git a/client/rhel/rhn-client-tools/src/actions/reboot.py \
b/client/rhel/rhn-client-tools/src/actions/reboot.py index 0397889..b13e3b2 100644
--- a/client/rhel/rhn-client-tools/src/actions/reboot.py
+++ b/client/rhel/rhn-client-tools/src/actions/reboot.py
@@ -20,7 +20,7 @@ cfg = config.initUp2dateConfig()
log = up2dateLog.initLog()
# action version we understand
-ACTION_VERSION = 2
+ACTION_VERSION = 2
def reboot(test=None, cache_only=None):
if cache_only:
@@ -28,7 +28,7 @@ def reboot(test=None, cache_only=None):
if cfg['noReboot']:
return (38, "Up2date is configured not to allow reboots", {})
-
+
pid = os.fork()
data = {'version': '0'}
if not pid:
diff --git a/client/rhel/rhn-client-tools/src/actions/rhnsd.py \
b/client/rhel/rhn-client-tools/src/actions/rhnsd.py index 86c6bf4..3f601b0 100644
--- a/client/rhel/rhn-client-tools/src/actions/rhnsd.py
+++ b/client/rhel/rhn-client-tools/src/actions/rhnsd.py
@@ -27,7 +27,7 @@ def __configRhnsd(interval, cache_only=None):
if comps[0] == "INTERVAL":
index = count
count = count + 1
-
+
if index != None:
tmplines[index] = "INTERVAL=%s" % interval
diff --git a/client/rhel/rhn-client-tools/src/actions/systemid.py \
b/client/rhel/rhn-client-tools/src/actions/systemid.py index be810d5..515997d 100644
--- a/client/rhel/rhn-client-tools/src/actions/systemid.py
+++ b/client/rhel/rhn-client-tools/src/actions/systemid.py
@@ -23,7 +23,7 @@ def disable(messageText, cache_only=None):
fd.write("Disable lock created on %s. RHN Server Message:\n\n%s\n" % (
time.ctime(time.time()), messageText))
fd.close()
-
+
# done if we survived this long
return(0, "systemId disable lock file has been writen", {})
diff --git a/client/rhel/rhn-client-tools/src/actions/up2date_config.py \
b/client/rhel/rhn-client-tools/src/actions/up2date_config.py index d913193..0edd125 \
100644
--- a/client/rhel/rhn-client-tools/src/actions/up2date_config.py
+++ b/client/rhel/rhn-client-tools/src/actions/up2date_config.py
@@ -82,7 +82,7 @@ def writeUp2dateMacro(macroName, macroValue):
value_r = re.compile("%s.*" % macroName)
blank_r = re.compile("\s*")
newfile = []
- for line in lines:
+ for line in lines:
m = value_r.match(line)
if m:
continue
@@ -93,7 +93,7 @@ def writeUp2dateMacro(macroName, macroValue):
continue
newfile.append(line)
-
+
# dont care about blank lines...
newfile.append("\n")
@@ -117,7 +117,7 @@ def main():
configdata['timeStampTest'] = timestamp
print configdata
import pprint
-
+
pprint.pprint(update(configdata))
configdata['serverURL'] = "http://localhost/XMLRPC"
diff --git a/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py \
b/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py index 57ecaf4..265a73e \
100644
--- a/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
@@ -7,7 +7,7 @@
# Authors:
# Adrian Likins <alikins@redhat.com>
# Preston Brown <pbrown@redhat.com>
-# James Bowes <jbowes@redhat.com>
+# James Bowes <jbowes@redhat.com>
import sys
@@ -25,7 +25,7 @@ from up2date_client import rhnHardware
try:
from virtualization import support
except ImportError:
- support = None
+ support = None
class ProfileCli(rhncli.RhnCli):
@@ -42,10 +42,10 @@ class ProfileCli(rhncli.RhnCli):
print _("Updating package profile...")
rhnPackageInfo.updatePackageProfile()
-
+
print _("Updating hardware profile...")
rhnHardware.updateHardware()
-
+
if support is not None:
print _("Updating virtualization profile...")
support.refresh(True)
diff --git a/client/rhel/rhn-client-tools/src/bin/rhn_check.py \
b/client/rhel/rhn-client-tools/src/bin/rhn_check.py index cb9f366..9f719b5 100755
--- a/client/rhel/rhn-client-tools/src/bin/rhn_check.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhn_check.py
@@ -56,7 +56,7 @@ cfg = config.initUp2dateConfig()
log = up2dateLog.initLog()
# action version we understand
-ACTION_VERSION = 2
+ACTION_VERSION = 2
# lock file to check if we're disabled at the server's request
DISABLE_FILE = "/etc/sysconfig/rhn/disable"
@@ -70,7 +70,7 @@ class CheckCli(rhncli.RhnCli):
def __init__(self):
super(CheckCli, self).__init__()
- self.rhns_ca_cert = cfg['sslCACert']
+ self.rhns_ca_cert = cfg['sslCACert']
self.server = None
def main(self):
@@ -174,13 +174,13 @@ class CheckCli(rhncli.RhnCli):
def __run_remote_actions(self):
# the list of caps the client needs
caps = capabilities.Capabilities()
-
+
status_report = CheckCli.__build_status_report()
action = self.__get_action(status_report)
while action != "" and action != {}:
self.__verify_server_capabilities(caps)
-
+
if self.is_valid_action(action):
try:
up2dateAuth.updateLoginInfo()
@@ -195,12 +195,12 @@ class CheckCli(rhncli.RhnCli):
response_headers = self.server.get_response_headers()
caps.populate(response_headers)
# do we actually want to validte here?
- try:
+ try:
caps.validate()
except up2dateErrors.ServerCapabilityError, e:
print e
sys.exit(1)
-
+
def __parse_action_data(self, action):
""" Parse action data and returns (method, params) """
data = action['action']
@@ -216,7 +216,7 @@ class CheckCli(rhncli.RhnCli):
# get a new server object with fresh headers
self.server = CheckCli.__get_server()
-
+
try:
ret = self.server.queue.submit(up2dateAuth.getSystemId(),
action_id, status, message, data)
@@ -236,15 +236,15 @@ class CheckCli(rhncli.RhnCli):
except socket.error:
print "Could not submit to %s.\n"\
"Possible networking problem?" % str(self.server)
- sys.exit(-1)
+ sys.exit(-1)
return ret
-
+
def handle_action(self, action, cache_only=None):
""" Wrapper handler for the action we're asked to do. """
log.log_debug("handle_action", action)
log.log_debug("handle_action actionid = %s, version = %s" % (
action['id'], action['version']))
-
+
(method, params) = self.__parse_action_data(action)
(status, message, data) = CheckCli.__run_action(method, params, \
{'cache_only': cache_only}) ret = 0
@@ -256,7 +256,7 @@ class CheckCli(rhncli.RhnCli):
def is_valid_action(self, action):
log.log_debug("check_action", action)
-
+
# be very paranoid of what we get back
if type(action) != type({}):
print "Got unparseable action response from server"
@@ -278,7 +278,7 @@ class CheckCli(rhncli.RhnCli):
xmlrpclib.Fault(-99, "Can not handle this version"))
return False
return True
-
+
@staticmethod
def __get_server():
""" Initialize a server connection and set up capability info. """
@@ -342,7 +342,7 @@ class CheckCli(rhncli.RhnCli):
method = getMethod.getMethod(method, "/usr/share/rhn/", "actions")
retval = method(*params, **kwargs)
-
+
return retval
@staticmethod
@@ -381,7 +381,7 @@ class CheckCli(rhncli.RhnCli):
def __check_instance_lock():
lock = None
try:
- lock = rhnLockfile.Lockfile('/var/run/rhn_check.pid')
+ lock = rhnLockfile.Lockfile('/var/run/rhn_check.pid')
except rhnLockfile.LockfileLockedException, e:
sys.stderr.write(rhncli.utf8_encode(_("Attempting to run more than one \
instance of rhn_check. Exiting.\n"))) sys.exit(0)
diff --git a/client/rhel/rhn-client-tools/src/bin/rhn_register.py \
b/client/rhel/rhn-client-tools/src/bin/rhn_register.py index 63c2293..67b4a52 100644
--- a/client/rhel/rhn-client-tools/src/bin/rhn_register.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhn_register.py
@@ -7,7 +7,7 @@
# Authors:
# Adrian Likins <alikins@redhat.com>
# Preston Brown <pbrown@redhat.com>
-# James Bowes <jbowes@redhat.com>
+# James Bowes <jbowes@redhat.com>
# Daniel Benamy <dbenamy@redhat.com>
import sys
@@ -27,9 +27,9 @@ from up2date_client import tui
from up2date_client import up2dateErrors
class RhnRegister(rhncli.RhnCli):
- """Runs rhn_register. Can run it in gui or tui mode depending on
+ """Runs rhn_register. Can run it in gui or tui mode depending on
availablility of gui, DISPLAY environment variable, and --nox switch.
-
+
"""
def __init__(self):
super(RhnRegister, self).__init__()
@@ -46,13 +46,13 @@ class RhnRegister(rhncli.RhnCli):
return gui
except:
pass
-
+
return tui
def main(self):
"""RhnCli (the base class) just sets stuff up and then calls this to run
the rest of the program.
-
+
"""
ui = self._get_ui()
ui.main()
@@ -64,7 +64,7 @@ class RhnRegister(rhncli.RhnCli):
sys.exit(1)
except up2dateErrors.RhnServerException:
sys.exit(1)
-
+
# Assuming registration worked, remember to save info (proxy setup,etc)
# from rhncli
self.saveConfig()
diff --git a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py \
b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py index 98307f4..f975bb9 100755
--- a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
@@ -1,13 +1,13 @@
#!/usr/bin/python
#
-# Registration client for the Spacewalk for useage with kickstart
+# Registration client for the Spacewalk for useage with kickstart
# Copyright (c) 1999--2012 Red Hat, Inc. Distributed under GPLv2.
#
# Authors:
# Adrian Likins <alikins@redhat.com>
# James Bowes <jbowes@redhat.com>
#
-# see the output of "--help" for the valid options.
+# see the output of "--help" for the valid options.
#
# The contact info is in the form or a "key: value" one per line.
# valid keys are:
@@ -77,7 +77,7 @@ class RegisterKsCli(rhncli.RhnCli):
if self.options.sslCACert:
rhnreg.cfg.set("sslCACert", self.options.sslCACert)
- if not (self.options.activationkey or
+ if not (self.options.activationkey or
(self.options.username and self.options.password)):
print _("A username and password are required "\
"to register a system.")
@@ -88,7 +88,7 @@ class RegisterKsCli(rhncli.RhnCli):
sys.exit(-1)
rhnreg.getCaps()
-
+
if not self.options.nopackages:
getArch = 0
if rhnreg.cfg['supportsExtendedPackageProfile']:
@@ -97,9 +97,9 @@ class RegisterKsCli(rhncli.RhnCli):
else:
packageList = []
-
+
hardwareList = hardware.Hardware()
-
+
if self.options.profilename:
profilename = self.options.profilename
else:
@@ -114,7 +114,7 @@ class RegisterKsCli(rhncli.RhnCli):
if not virt_uuid is None:
other['virt_uuid'] = virt_uuid
other['virt_type'] = virt_type
-
+
# If specified, send up the EUS channel label for subscription.
if self.options.use_eus_channel:
if self.options.activationkey:
@@ -123,7 +123,7 @@ class RegisterKsCli(rhncli.RhnCli):
if not rhnreg.server_supports_eus():
print _("The server you are registering against does not support \
EUS.") sys.exit(-1)
-
+
channels = rhnreg.getAvailableChannels(self.options.username,
self.options.password)
other['channel'] = channels['default_channel']
@@ -142,7 +142,7 @@ class RegisterKsCli(rhncli.RhnCli):
up2dateErrors.AuthenticationOrAccountCreationError), e:
print "%s" % e.errmsg
sys.exit(1)
-
+
# collect hardware info, inluding hostname
if not self.options.nohardware:
rhnreg.sendHardware(systemId, hardwareList)
@@ -190,14 +190,14 @@ class RegisterKsCli(rhncli.RhnCli):
hostname = hw.get('hostname')
ipaddr = hw.get('ipaddr')
ip6addr = hw.get('ipaddr6')
-
+
if hostname:
profileName = idn_pune_to_unicode(hostname)
elif ipaddr:
profileName = ipaddr
elif ip6addr:
profileName = ip6addr
-
+
if not profileName:
print _("A profilename was not specified, "\
"and hostname and IP address could not be determined "\
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py \
b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py \
index 4b04172..d27e1c6 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py
@@ -42,19 +42,19 @@ class RhnChooseServerWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.ChooseServe needsparent = 1
needsnetwork = 1
noSidebar = True
-
+
def __init__(self):
RhnRegisterFirstbootGuiWindow.__init__(self)
rhnregGui.ChooseServerPage.__init__(self)
if rhnreg.registered():
self.skipme = True
-
+
def _getVbox(self):
return self.chooseServerPageVbox()
-
+
def updatePage(self):
self.chooseServerPagePrepare()
-
+
def apply(self, *args):
"""Returns True to change the page (to the one set)."""
try:
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py \
b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py \
index 592739e..1f99b81 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py
@@ -59,7 +59,7 @@ class RhnCreateProfileWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.CreateProf
def updatePage(self):
self.createProfilePagePrepare()
-
+
def _getVbox(self):
return self.createProfilePageVbox()
@@ -72,7 +72,7 @@ class RhnCreateProfileWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.CreateProf ret = self.createProfilePageApply()
if ret:
return None
-
+
return True
childWindow = RhnCreateProfileWindow
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py \
b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py index \
637b4d3..680d75a 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py
@@ -40,16 +40,16 @@ class RhnFinishWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.FinishPage): needsparent = 1
needsnetwork = 1
noSidebar = True
-
+
def __init__(self):
RhnRegisterFirstbootGuiWindow.__init__(self)
rhnregGui.FinishPage.__init__(self)
if rhnreg.registered():
self.skipme = True
-
+
def _getVbox(self):
return self.finishPageVbox()
-
+
def updatePage(self):
## if rhnregGui.hasBaseChannelAndUpdates():
## self.druid.finish.set_label(_("_Finish"))
@@ -60,12 +60,12 @@ class RhnFinishWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.FinishPage): self.finishPagePrepare()
## self.mainWin.set_title(title)
## self.finishPage.set_title(title)
-
+
def apply(self, *args):
- """Returns None to stay on the same page. Anything else will cause
- firstboot to advance but True is generally used. This is different from
+ """Returns None to stay on the same page. Anything else will cause
+ firstboot to advance but True is generally used. This is different from
the gnome druid in rhn_register.
-
+
"""
up2DateConfig = config.initUp2dateConfig()
up2DateConfig.save()
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py \
b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py index \
c713ef3..857537a 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py
@@ -60,7 +60,7 @@ class RhnLoginWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.LoginPage): # self.getCaps()
self.loginPagePrepare()
self.goingNextFromNewAccountDialog = False
-
+
def grabFocus(self):
# We must set focus where we want it here. Setting it in updatePage
# doesn't work.
@@ -70,25 +70,25 @@ class RhnLoginWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.LoginPage): return self.loginPageVbox()
def apply(self, *args):
- """Returns None to stay on the same page. Anything else will cause
- firstboot to advance but True is generally used. This is different from
+ """Returns None to stay on the same page. Anything else will cause
+ firstboot to advance but True is generally used. This is different from
the gnome druid in rhn_register.
-
+
"""
if self.doDebug:
print "applying rhn_login_gui"
-
+
# This is a hack. This function will get called if they click next on
- # the login page (the else) or when they create an account (the if). In
+ # the login page (the else) or when they create an account (the if). In
# that case we don't want to do the normal logging in stuff.
if self.goingNextFromNewAccountDialog:
assert rhnregGui.newAccount is True
else:
if self.loginPageVerify():
return None
-
+
assert rhnregGui.newAccount is False
-
+
if self.loginPageApply():
return None
@@ -97,12 +97,12 @@ class RhnLoginWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.LoginPage):
self.parent.setPage('rhn_create_profile_gui')
return True
-
+
def goToPageAfterLogin(self):
# This is a hack. More info above.
self.goingNextFromNewAccountDialog = True
self.parent.nextClicked()
-
+
def onLoginPageNext(self, dummy=None, dummy2=None):
# This is a hackish way to support enter advancing
self.parent.nextClicked()
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py \
b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py
index b525432..dec389d 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py
@@ -41,23 +41,23 @@ class RhnProvideCertificateWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.Provi needsparent = 1
needsnetwork = 1
noSidebar = True
-
+
def __init__(self):
RhnRegisterFirstbootGuiWindow.__init__(self)
rhnregGui.ProvideCertificatePage.__init__(self)
if rhnreg.registered():
self.skipme = True
-
+
def _getVbox(self):
return self.provideCertificatePageVbox()
-
+
def apply(self, *args):
"""Returns True to change the page or None to stay on the same page."""
status = self.provideCertificatePageApply()
if status == 0: # cert was installed
return True
elif status == 1: # the user doesn't want to provide a cert right now
- # TODO write a message to disk like the other cases? need to decide
+ # TODO write a message to disk like the other cases? need to decide
# how we want to do error handling in general.
self.parent.setPage("rhn_finish_gui")
return True
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_register_firstboot_gui_window.py \
b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_register_firstboot_gui_window.py
index 60725ac..2a8382a 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_register_firstboot_gui_window.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_register_firstboot_gui_window.py
@@ -13,7 +13,7 @@ import rhnregGui
class RhnRegisterFirstbootGuiWindow(FirstbootModuleWindow):
"""This is a base class for our firstboot screens. It shouldn't be used
directly.
-
+
"""
needsparent = 1
@@ -37,9 +37,9 @@ class RhnRegisterFirstbootGuiWindow(FirstbootModuleWindow):
def launch(self, doDebug=None):
"""Firstboot calls this to set up the screen. It will use the _getVbox
- method provided by the derived classes to get the contents of the
+ method provided by the derived classes to get the contents of the
screen.
-
+
"""
self.doDebug = doDebug
if self.doDebug:
@@ -55,11 +55,11 @@ class RhnRegisterFirstbootGuiWindow(FirstbootModuleWindow):
internalVBox.pack_start(vbox, True)
self.mainVBox.pack_start(internalVBox, True)
-
+
# Set up cursor changing functions. Overriding functions that aren't in
- # classes like this could be called a hack, but I think it's the best
+ # classes like this could be called a hack, but I think it's the best
# we can do with the current overall setup and isn't too bad.
- # Having it here will cause this to get called once per module, but I'm
+ # Having it here will cause this to get called once per module, but I'm
# not sure if it'll work to put it in the constructor.
def mySetBusyCursor():
cursor = gtk.gdk.Cursor(gtk.gdk.WATCH)
@@ -82,7 +82,7 @@ class RhnRegisterFirstbootGuiWindow(FirstbootModuleWindow):
gtk.main_iteration(False)
rhnregGui.setBusyCursor = mySetBusyCursor
rhnregGui.setArrowCursor = mySetArrowCursor
-
+
return self.mainVBox, self.icon, self.windowTitle
def grabFocus(self):
@@ -98,7 +98,7 @@ class RhnRegisterFirstbootGuiWindow(FirstbootModuleWindow):
text = error
dlg = messageWindow.ErrorDialog(text)
self._goImmediatelyToFinish()
-
+
def _goImmediatelyToFinish(self):
self.parent.setPage("rhn_finish_gui")
def dummyApply(self, *args):
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py \
b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py index \
6a4cea7..de7869b 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py
@@ -39,24 +39,24 @@ class RhnReviewWindow(RhnRegisterFirstbootGuiWindow, \
rhnregGui.ReviewSubscriptio needsparent = 1
needsnetwork = 1
noSidebar = True
-
+
def __init__(self):
RhnRegisterFirstbootGuiWindow.__init__(self)
rhnregGui.ReviewSubscriptionPage.__init__(self)
if rhnreg.registered():
self.skipme = True
-
+
def _getVbox(self):
return self.reviewSubscriptionPageVbox()
-
+
def updatePage(self):
self.reviewSubscriptionPagePrepare()
-
+
def apply(self, *args):
- """Returns None to stay on the same page. Anything else will cause
- firstboot to advance but True is generally used. This is different from
+ """Returns None to stay on the same page. Anything else will cause
+ firstboot to advance but True is generally used. This is different from
the gnome druid in rhn_register.
-
+
"""
return True
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py \
b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py index \
1027600..d451b2f 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py
@@ -38,7 +38,7 @@ class RhnStartWindow(RhnRegisterFirstbootGuiWindow):
windowTitle = moduleName
shortMessage = _("Register with Red Hat Satellite")
needsparent = 1
-
+
def __init__(self):
RhnRegisterFirstbootGuiWindow.__init__(self)
self.start_page = None
@@ -52,13 +52,13 @@ class RhnStartWindow(RhnRegisterFirstbootGuiWindow):
else:
self.start_page = NoNetworkPage()
return self.start_page.startPageVbox()
-
+
def apply(self, *args):
"""Returns True to change the page (to the one set)."""
if not self.start_page.startPageRegisterNow():
dlg = rhnregGui.ConfirmQuitDialog()
if not dlg.rc:
- self.parent.setPage("rhn_start_gui")
+ self.parent.setPage("rhn_start_gui")
else:
self.parent.setPage("rhn_finish_gui")
return True
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_create_profile_gui.py \
b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_create_profile_gui.py \
index 0bfdc9f..cc83f5c 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_create_profile_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_create_profile_gui.py
@@ -58,7 +58,7 @@ class moduleClass(Module):
return RESULT_JUMP
if ret:
return RESULT_FAILURE
-
+
return RESULT_SUCCESS
def createScreen(self):
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_provide_certificate_gui.py \
b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_provide_certificate_gui.py
index 7d15316..2fee941 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_provide_certificate_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_provide_certificate_gui.py
@@ -51,7 +51,7 @@ class moduleClass(Module):
if status == 0: # cert was installed
return RESULT_SUCCESS
elif status == 1: # the user doesn't want to provide a cert right now
- # TODO write a message to disk like the other cases? need to decide
+ # TODO write a message to disk like the other cases? need to decide
# how we want to do error handling in general.
interface.moveToPage(moduleTitle=_("Finish Updates Setup"))
return RESULT_JUMP
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_start_gui.py \
b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_start_gui.py index \
3f883a0..0075fac 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_start_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_start_gui.py
@@ -98,7 +98,7 @@ class moduleClass(Module):
self.start_page = NoNetworkPage()
self.skip_registration = True
return self.start_page.startPageVbox()
-
+
class KsRegisteredPage:
def __init__(self):
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py \
b/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py index \
1e22af6..60ead41 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py
@@ -30,11 +30,11 @@ def parseCap(capstring):
except ValueError:
# Bad directive: not in 'a = b' format
continue
-
+
# parse out the version
# lets give it a shot sans regex's first...
(key,version) = string.split(key_version, "(", 1)
-
+
# just to be paranoid
if version[-1] != ")":
print "something broke in parsing the capabilited headers"
@@ -171,20 +171,20 @@ class Capabilities(UserDict.UserDict):
def hasCapability(self, capability, version=None):
"""Checks if the server supports a capability and optionally a version.
Returns True or False.
-
+
This complements the neededCaps mechanism provided by this module.
- Using hasCapability makes it easier to do something only if the server
- supports it or to put workaround code in the user of this class. The
+ Using hasCapability makes it easier to do something only if the server
+ supports it or to put workaround code in the user of this class. The
neededCaps mechanism makes it easier to put workaround code in this
module, which makes sense if it is to be shared.
-
- 'capability' should be a string such as 'registration.foobar'. It can
- be a capability in 'neededCaps' above or one that isn't there. 'version'
+
+ 'capability' should be a string such as 'registration.foobar'. It can
+ be a capability in 'neededCaps' above or one that isn't there. 'version'
can be a string (where isdigit() is True) or an int.
-
+
"""
assert version is None or str(version).isdigit()
-
+
if not self.data.has_key(capability):
return False
if version:
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py \
b/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py index \
dbc0665..e62238a 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py
@@ -57,13 +57,13 @@ def loadLocalCaps(capsDir = "/etc/sysconfig/rhn/clientCaps.d"):
caps.data[cap] = data
# print caps.data
-
+
loadLocalCaps()
# register local caps we require.
def registerCap(cap, data):
caps.data[cap] = data
-
+
# figure out something pretty here
registerCap("packages.runTransaction", {'version':'1', 'value':'1'})
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/debUtils.py \
b/client/rhel/rhn-client-tools/src/up2date_client/debUtils.py index 04880bb..2306488 \
100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/debUtils.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/debUtils.py
@@ -15,7 +15,7 @@ _ = t.ugettext
# FIXME: After Debian bug 187019 is resolved
def verifyPackages(packages):
cache = apt.Cache()
- missing_packages = []
+ missing_packages = []
for package in packages:
pkg = cache[package[0]]
if pkg == None or not pkg.is_installed:
@@ -28,7 +28,7 @@ def parseVRE(version):
release = '0'
if version.find(':') != -1:
epoch, version = version.split(':')
- if version.find('-') != -1:
+ if version.find('-') != -1:
tmp = version.split('-')
version = '-'.join(tmp[:-1])
release = tmp[-1]
@@ -46,7 +46,7 @@ def installTime(pkg_name, pkg_arch):
#FIXME: Using Apt cache might not be an ultimate solution.
# It could be better to parse /var/lib/dpkg/status manually.
-# Apt cache might not contain all the packages.
+# Apt cache might not contain all the packages.
def getInstalledPackageList(msgCallback = None, progressCallback = None,
getArch=None, getInfo = None):
""" Return list of packages. Package is dict with following keys:
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/getMethod.py \
b/client/rhel/rhn-client-tools/src/up2date_client/getMethod.py index c7fc46a..39da7fb \
100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/getMethod.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/getMethod.py
@@ -24,7 +24,7 @@ def sanity(methodNameComps):
# Verifies if all the components have proper names
#"""
# Allowed characters in each string
- alpha = string.ascii_lowercase + string.ascii_uppercase
+ alpha = string.ascii_lowercase + string.ascii_uppercase
allowedChars = alpha + string.digits + '_'
for comp in methodNameComps:
if not len(comp):
@@ -45,7 +45,7 @@ def getMethod(methodName, abspath, baseClass):
#route/label.
#"""
# First split the method name
- methodNameComps = string.split(baseClass, '.') + string.split(methodName, '.')
+ methodNameComps = string.split(baseClass, '.') + string.split(methodName, '.')
# Sanity checks
sanity(methodNameComps)
# Build the path to the file
@@ -58,7 +58,7 @@ def getMethod(methodName, abspath, baseClass):
# Okay, go on
continue
# Try to load this as a file
- for extension in ['py', 'pyc', 'pyo']:
+ for extension in ['py', 'pyc', 'pyo']:
if os.path.isfile("%s.%s" % (path, extension)):
# Yes, this is a file
break
@@ -131,7 +131,7 @@ if __name__ == '__main__':
try:
method = getMethod(m, '.', 'Actions')
except GetMethodException, e:
- print "Error getting the method %s: %s" % (m,
+ print "Error getting the method %s: %s" % (m,
string.join(map(str, e.args)))
else:
method()
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/haltree.py \
b/client/rhel/rhn-client-tools/src/up2date_client/haltree.py index 4c8c750..c59715c \
100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/haltree.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/haltree.py
@@ -4,14 +4,14 @@
# HalTree is a way to organize the mess of data you get from hal. In general,
# if you want to get all the information about every device in the system, you
# end up with a list of dicts, where each dict contains the property name/values
-# for a device. This list isn't very useful as the hal data is actually
+# for a device. This list isn't very useful as the hal data is actually
# organized into a tree. For example, you have the computer as the head, then
# there may be a scsi card plugged in. That in turn will have scsi channels
# and luns, which scsi devices may be connected to. So this module will help
# you reorganize your hal data back to the way they were intended.
#
# HalTree Usage:
-#
+#
# The tree gets built one device at a time. Once you've created a HalTree
# object, devices get added to the tree with HalTree.add(hw_dev_dict). The
# devices can be added in any particular order, and the tree gets properly
@@ -33,7 +33,7 @@ class HalDevice:
self.properties = properties
self.children = []
self.classification = None
-
+
if properties.has_key('info.parent'):
self.parent_udi = properties['info.parent']
else:
@@ -46,8 +46,8 @@ class HalDevice:
for property, value in self.properties.items():
print " ", property," ==> ", value
-
-
+
+
class HalTree:
def __init__ (self):
@@ -65,10 +65,10 @@ class HalTree:
self.no_parent_yet.append(hal_device)
else: #if it doesn't have a parent, it must be the head 'computer'
self.head = hal_device
-
+
#check to see if there are any children waiting for this dev
self.__get_lost_children(hal_device)
-
+
def __get_lost_children(self, hal_device):
found_list = []
@@ -81,7 +81,7 @@ class HalTree:
self.no_parent_yet.remove(dev)
def __find_node(self, udi):
- """
+ """
This takes a node in the HalDevice tree and returns the HalDevice with
the given udi.
"""
@@ -105,10 +105,10 @@ class HalTree:
if res:
return res
return None
-
+
def print_tree(self):
self.__print_dev_tree(self.head, "")
-
+
def __print_dev_tree(self, node, indent):
print indent, node.udi
print indent, "CLASS:", node.classification
@@ -118,7 +118,7 @@ class HalTree:
print indent + " ", "%-20s ==> %s" % (name, \
hex(int(property))) else:
print indent + " ", "%-20s ==> %s" % (name, property)
- elif (type(property) == types.IntType):
+ elif (type(property) == types.IntType):
print indent + " ", "%-20s ==> %s" % (name, hex(int(property)))
else:
print indent + " ", "%-20s ==> %s" % (name, property)
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py \
b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py index 69a9670..3cb7d1e \
100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -148,10 +148,10 @@ def read_installinfo():
continue
strippedstring = vals[0].strip()
vals[0] = strippedstring
-
+
installdict[vals[0]] = ''.join(vals[1:]).strip()
return installdict
-
+
def cpu_count():
""" returns number of CPU in system
@@ -269,7 +269,7 @@ def read_cpuinfo():
# class, desc (required to identify the hardware device)
# count, type, model, model_number, model_ver, model_rev
# bogomips, platform, speed, cache
-
+
hwdict = { 'class': "CPU",
"desc" : "Processor",
}
@@ -281,7 +281,7 @@ def read_cpuinfo():
hwdict['platform'] = 'x86_64'
else:
hwdict['platform'] = "i386"
-
+
hwdict['count'] = count
hwdict['type'] = get_entry(tmpdict, 'vendor_id')
hwdict['model'] = get_entry(tmpdict, 'model name')
@@ -353,7 +353,7 @@ def read_cpuinfo():
hwdict['speed'] = int(round(float(mhz_speed)) - 1)
except ValueError:
hwdict['speed'] = -1
-
+
elif uname in ['s390', 's390x']:
tmpdict = {}
for cpu in cpulist.split("\n"):
@@ -374,7 +374,7 @@ def read_cpuinfo():
hwdict['other'] = get_entry(tmpdict, 'features')
hwdict['speed'] = 0
-
+
else:
# XXX: expand me. Be nice to others
hwdict['platform'] = uname
@@ -411,7 +411,7 @@ def read_cpuinfo():
number_sockets = __get_number_sockets()
if number_sockets:
hwdict['socket_count'] = number_sockets
-
+
# This whole things hurts a lot.
return hwdict
@@ -460,10 +460,10 @@ def read_memory_2_6():
#print blobs
value = blobs[1].strip()
meminfo_dict[key] = value
-
+
memdict = {}
memdict["class"] = "MEMORY"
-
+
total_str = meminfo_dict['MemTotal']
blips = total_str.split(" ")
total_k = long(blips[0])
@@ -533,11 +533,11 @@ def findHostByRoute():
continue
hostname = info.strip()
- # Override hostname with the one in /etc/sysconfig/network
+ # Override hostname with the one in /etc/sysconfig/network
# for bz# 457953
elif os.path.isfile("/etc/sysconfig/network") and \
os.access("/etc/sysconfig/network", os.R_OK): networkinfo = \
open("/etc/sysconfig/network", "r").readlines()
-
+
for info in networkinfo:
if not len(info):
continue
@@ -549,7 +549,7 @@ def findHostByRoute():
if vals[0] == "HOSTNAME":
hostname = ''.join(vals[1:]).strip()
break
-
+
if hostname == None or hostname == 'localhost.localdomain':
hostname = "unknown"
return hostname, intf, intf6
@@ -574,7 +574,7 @@ def get_slave_hwaddr(master, slave):
bonding.close()
return hwaddr
-
+
def read_network():
netdict = {}
netdict['class'] = "NETINFO"
@@ -624,7 +624,7 @@ def read_network_interfaces():
hwaddr = ethtool.get_hwaddr(interface)
except:
hwaddr = ""
-
+
# slave devices can have their hwaddr changed
try:
master = os.readlink('/sys/class/net/%s/master' % interface)
@@ -680,25 +680,25 @@ def read_network_interfaces():
return intDict
-# Read DMI information via hal.
+# Read DMI information via hal.
def read_dmi():
dmidict = {}
- dmidict["class"] = "DMI"
+ dmidict["class"] = "DMI"
# Try to obtain DMI info if architecture is i386, x86_64 or ia64
uname = os.uname()[4].lower()
if not (uname[0] == "i" and uname[-2:] == "86") and not (uname == "x86_64"):
return dmidict
- # System Information
+ # System Information
vendor = dmi_vendor()
if vendor:
dmidict["vendor"] = vendor
-
+
product = get_dmi_data('/dmidecode/SystemInfo/ProductName')
if product:
dmidict["product"] = product
-
+
version = get_dmi_data('/dmidecode/SystemInfo/Version')
if version:
system = product + " " + version
@@ -707,7 +707,7 @@ def read_dmi():
# BaseBoard Information
dmidict["board"] = get_dmi_data('/dmidecode/BaseBoardInfo/Manufacturer')
- # Bios Information
+ # Bios Information
vendor = get_dmi_data('/dmidecode/BIOSinfo/Vendor')
if vendor:
dmidict["bios_vendor"] = vendor
@@ -723,27 +723,27 @@ def read_dmi():
chassis_serial = get_dmi_data('/dmidecode/ChassisInfo/SerialNumber')
chassis_tag = get_dmi_data('/dmidecode/ChassisInfo/AssetTag')
board_serial = get_dmi_data('/dmidecode/BaseBoardInfo/SerialNumber')
-
+
system_serial = get_dmi_data('/dmidecode/SystemInfo/SerialNumber')
-
+
dmidict["asset"] = "(%s: %s) (%s: %s) (%s: %s) (%s: %s)" % ("chassis", \
chassis_serial,
"chassis", chassis_tag,
"board", board_serial,
"system", system_serial)
-
- # Clean up empty entries
+
+ # Clean up empty entries
for k in dmidict.keys()[:]:
if dmidict[k] is None:
del dmidict[k]
# Finished
-
+
return dmidict
def get_hal_system_and_smbios():
try:
if using_gudev:
props = get_computer_info()
- else:
+ else:
computer = get_hal_computer()
props = computer.GetAllProperties()
except Exception, e:
@@ -790,7 +790,7 @@ def Hardware():
hal_status, dbus_status = check_hal_dbus_status()
hwdaemon = 1
if hal_status or dbus_status:
- # if status != 0 haldaemon or messagebus service not running.
+ # if status != 0 haldaemon or messagebus service not running.
# set flag and dont try probing hardware and DMI info
# and warn the user.
log = up2dateLog.initLog()
@@ -802,14 +802,14 @@ def Hardware():
if hwdaemon:
try:
ret = read_hal()
- if ret:
+ if ret:
allhw = ret
except:
# bz253596 : Logging Dbus Error messages instead of printing on \
stdout log = up2dateLog.initLog()
msg = "Error reading hardware information: %s\n" % (sys.exc_type)
log.log_me(msg)
-
+
# all others return individual arrays
# cpu info
@@ -818,26 +818,26 @@ def Hardware():
if ret: allhw.append(ret)
except:
print _("Error reading cpu information:"), sys.exc_type
-
+
# memory size info
try:
ret = read_memory()
if ret: allhw.append(ret)
except:
print _("Error reading system memory information:"), sys.exc_type
-
+
cfg = config.initUp2dateConfig()
if not cfg["skipNetwork"]:
# minimal networking info
try:
ret = read_network()
- if ret:
+ if ret:
allhw.append(ret)
except:
print _("Error reading networking information:"), sys.exc_type
# dont like catchall exceptions but theres not
# really anything useful we could do at this point
- # and its been trouble prone enough
+ # and its been trouble prone enough
# minimal DMI info
try:
@@ -849,7 +849,7 @@ def Hardware():
log = up2dateLog.initLog()
msg = "Error reading DMI information: %s\n" % (sys.exc_type)
log.log_me(msg)
-
+
try:
ret = read_installinfo()
if ret:
@@ -864,7 +864,7 @@ def Hardware():
allhw.append(ret)
except:
print _("Error reading network interface information:"), sys.exc_type
-
+
# all Done.
return allhw
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py \
b/client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py index \
11dcc3a..44e7240 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py
@@ -110,25 +110,25 @@ class YesNoDialog(MessageWindow):
class BulletedOkDialog:
"""A dialog box that can have one more sections of text. Each section can
be standard blob of text or a bulleted item.
-
+
"""
def __init__ (self, title=None, parent=None):
self.rc = None
self.dialog = gtk.Dialog(title, parent, 0, ("Close", 1))
self.dialog.set_has_separator(False)
- # Vbox to contain just the stuff that will be add to the dialog with
+ # Vbox to contain just the stuff that will be add to the dialog with
# addtext
self.vbox = gtk.VBox(spacing)
self.vbox.set_border_width(15)
# Put our vbox into the top part of the dialog
self.dialog.get_children()[0].pack_start(self.vbox, expandúlse)
-
+
def add_text(self, text):
label = gtk.Label(text)
label.set_alignment(0, 0)
label.set_line_wrap(True)
self.vbox.pack_start(label, expandúlse)
-
+
def add_bullet(self, text):
label = gtk.Label(text)
label.set_alignment(0, 0)
@@ -139,7 +139,7 @@ class BulletedOkDialog:
hbox.pack_start(bullet, expandúlse)
hbox.pack_start(label, expandúlse)
self.vbox.pack_start(hbox, expandúlse)
-
+
def run(self):
# addFrame(self.dialog) # Need to do this differently if we want it
self.dialog.set_position(gtk.WIN_POS_CENTER)
@@ -150,6 +150,6 @@ class BulletedOkDialog:
self.rc = 0
self.dialog.destroy()
gtk.main_iteration()
-
+
def getrc (self):
return self.rc
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnChannel.py \
b/client/rhel/rhn-client-tools/src/up2date_client/rhnChannel.py index \
c7436eb..85d45ca 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnChannel.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnChannel.py
@@ -19,7 +19,7 @@ class rhnChannel:
for kw in kwargs.keys():
self.dict[kw] = kwargs[kw]
-
+
def __getitem__(self, item):
return self.dict[item]
@@ -100,7 +100,7 @@ def getChannels(force=None, label_whitelist=None, timeout=None):
for chan in up2dateChannels:
if label_whitelist and not label_whitelist.has_key(chan['label']):
continue
-
+
channel = rhnChannel(type = 'up2date', url = config.getServerlURL())
for key in chan.keys():
if key == "last_modified":
@@ -113,7 +113,7 @@ def getChannels(force=None, label_whitelist=None, timeout=None):
raise up2dateErrors.NoChannelsError(_("This system may not be updated until \
it is associated with a channel."))
return selected_channels
-
+
def setChannels(tempchannels):
global selected_channels
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnHardware.py \
b/client/rhel/rhn-client-tools/src/up2date_client/rhnHardware.py index \
f52ac6c..56f7287 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnHardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnHardware.py
@@ -6,7 +6,7 @@ import hardware
def updateHardware():
s = rpcServer.getServer()
-
+
hardwareList = hardware.Hardware()
s.registration.refresh_hw_profile(up2dateAuth.getSystemId(),
hardwareList)
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 90c7ad6..00bc724 \
100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
@@ -16,7 +16,7 @@
# Authors:
# Adrian Likins <alikins@redhat.com>
# Preston Brown <pbrown@redhat.com>
-# James Bowes <jbowes@redhat.com>
+# James Bowes <jbowes@redhat.com>
#
# In addition, as a special exception, the copyright holders give
# permission to link the code of portions of this program with the
@@ -84,7 +84,7 @@ class RhnCli(object):
self.options = None
self.args = None
-
+
self.hasGui = False
def run(self):
@@ -132,7 +132,7 @@ class RhnCli(object):
def initialize(self):
(self.options, self.args) = self.optparser.parse_args()
-
+
RhnCli.__setDebugLevel(self.options.verbose)
# see if were running as root
@@ -218,7 +218,7 @@ class RhnCli(object):
def __setDebugLevel(level):
cfg = config.initUp2dateConfig()
# figure out the debug level
- cfg["debug"] = cfg["debug"] + level
+ cfg["debug"] = cfg["debug"] + level
if cfg["debug"] > 2:
pkgUtils.setDebugVerbosity()
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py \
b/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py index bd07b4b..80b7c69 \
100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
@@ -11,7 +11,7 @@ import urllib2
import clientCaps
import up2dateLog
-import up2dateErrors
+import up2dateErrors
import up2dateUtils
import up2dateAuth
import urlparse
@@ -41,7 +41,7 @@ class RetryServer(rpclib.Server):
except xmlrpclib.Fault:
raise
except httplib.BadStatusLine:
- self.log.log_me("Error: Server Unavailable. Please try later.")
+ self.log.log_me("Error: Server Unavailable. Please try later.")
stdoutMsgCallback(
_("Error: Server Unavailable. Please try later."))
sys.exit(-1)
@@ -80,18 +80,18 @@ class RetryServer(rpclib.Server):
break
return ret
-
+
def __getattr__(self, name):
# magic method dispatcher
return rpclib.xmlrpclib._Method(self._request1, name)
-
+
# uh, yeah, this could be an iterator, but we need it to work on 1.5 as well
class ServerList:
def __init__(self, serverlist=[]):
self.serverList = serverlist
self.index = 0
-
+
def server(self):
self.serverurl = self.serverList[self.index]
return self.serverurl
@@ -156,7 +156,7 @@ def getServer(refreshCallback=None, serverOverride=None, \
timeout=None): s.addServerList(serverList)
s.add_header("X-Up2date-Version", up2dateUtils.version())
-
+
if lang:
s.setlang(lang)
@@ -199,7 +199,7 @@ def doCall(method, *args, **kwargs):
while 1:
failure = 0
- ret = None
+ ret = None
try:
ret = method(*args, **kwargs)
except KeyboardInterrupt:
@@ -217,7 +217,7 @@ def doCall(method, *args, **kwargs):
else:
failure = 1
except httplib.IncompleteRead:
- print "httplib.IncompleteRead"
+ print "httplib.IncompleteRead"
raise up2dateErrors.CommunicationError("httplib.IncompleteRead"), None, \
sys.exc_info()[2]
except urllib2.HTTPError, e:
@@ -227,9 +227,9 @@ def doCall(method, *args, **kwargs):
msg = msg + "Error Message: %s\n" % e.msg
log.log_me(msg)
raise up2dateErrors.CommunicationError(msg), None, sys.exc_info()[2]
-
+
except xmlrpclib.ProtocolError, e:
-
+
log.log_me("A protocol error occurred: %s , attempt #%s," % (
e.errmsg, attempt_count))
if e.errcode == 404:
@@ -263,7 +263,7 @@ def doCall(method, *args, **kwargs):
pkg = args[0]
else:
pkg=args[1]
-
+
if type(pkg) == type([]):
pkgName = "%s-%s-%s.%s" % (pkg[0], pkg[1], pkg[2], pkg[4])
else:
@@ -271,13 +271,13 @@ def doCall(method, *args, **kwargs):
msg = "File Not Found: %s\n%s" % (pkgName, errMsg)
log.log_me(msg)
raise up2dateErrors.FileNotFoundError(msg), None, sys.exc_info()[2]
-
+
if not reset:
if attempt_count >= attempts:
raise up2dateErrors.CommunicationError(e.errmsg), None, \
sys.exc_info()[2] else:
failure = 1
-
+
except xmlrpclib.ResponseError:
raise up2dateErrors.CommunicationError(
"Broken response from the server."), None, sys.exc_info()[2]
@@ -292,9 +292,9 @@ def doCall(method, *args, **kwargs):
# rest for five seconds before trying again
time.sleep(5)
attempt_count = attempt_count + 1
-
+
if attempt_count > attempts:
raise up2dateErrors.CommunicationError("The data returned from the \
server was incomplete")
return ret
-
+
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py \
b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py index 85ed0ed..b2d60bd \
100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py
@@ -22,17 +22,17 @@ import gettext
t = gettext.translation('rhn-client-tools', fallback=True)
_ = t.ugettext
-def installedHeaderByKeyword(**kwargs):
+def installedHeaderByKeyword(**kwargs):
""" just cause this is such a potentially useful looking method... """
- _ts = transaction.initReadOnlyTransaction()
- mi = _ts.dbMatch()
- for keyword in kwargs.keys():
- mi.pattern(keyword, rpm.RPMMIRE_GLOB, kwargs[keyword])
- # we really shouldnt be getting multiples here, but what the heck
- headerList = []
- for h in mi:
- headerList.append(h)
-
+ _ts = transaction.initReadOnlyTransaction()
+ mi = _ts.dbMatch()
+ for keyword in kwargs.keys():
+ mi.pattern(keyword, rpm.RPMMIRE_GLOB, kwargs[keyword])
+ # we really shouldnt be getting multiples here, but what the heck
+ headerList = []
+ for h in mi:
+ headerList.append(h)
+
return headerList
def verifyPackages(packages):
@@ -40,7 +40,7 @@ def verifyPackages(packages):
and return a dict keyed off that data
"""
data = {}
- missing_packages = []
+ missing_packages = []
# data structure is keyed off package
# label, with value being an array of each
# line of the output from -V
@@ -64,7 +64,7 @@ def verifyPackages(packages):
del(keywords[key])
headers = installedHeaderByKeyword(**keywords)
- if len(headers) == 0:
+ if len(headers) == 0:
missing_packages.append(package)
for header in headers:
@@ -75,7 +75,7 @@ def verifyPackages(packages):
arch = header["arch"]
if arch == None:
arch = ""
-
+
pkg = (header['name'], header['version'],
header['release'], epoch,
arch)
@@ -85,13 +85,13 @@ def verifyPackages(packages):
packageLabel = "%s-%s-%s" % (pkg[0], pkg[1], pkg[2])
else:
packageLabel = "%s-%s-%s.%s" % (pkg[0], pkg[1], pkg[2], pkg[4])
-
+
verifystring = "/usr/bin/rpmverify -V %s" % packageLabel
-
+
fd = os.popen(verifystring)
res = fd.readlines()
fd.close()
-
+
reslist = []
for line in res:
reslist.append(line.strip())
@@ -107,21 +107,21 @@ def getInstalledPackageList(msgCallback = None, \
progressCallback = None, version, release and optionaly arch and cookie
"""
pkg_list = []
-
+
if msgCallback != None:
msgCallback(_("Getting list of packages installed on the system"))
-
- _ts = transaction.initReadOnlyTransaction()
+
+ _ts = transaction.initReadOnlyTransaction()
count = 0
total = 0
-
+
for h in _ts.dbMatch():
if h == None:
break
count = count + 1
-
+
total = count
-
+
count = 0
for h in _ts.dbMatch():
if h == None:
@@ -150,11 +150,11 @@ def getInstalledPackageList(msgCallback = None, \
progressCallback = None, pkg_list.append(package)
else:
pkg_list.append(package)
-
+
if progressCallback != None:
progressCallback(count, total)
count = count + 1
-
+
pkg_list.sort(key=lambda x:(x['name'], x['epoch'], x['version'], x['release']))
return pkg_list
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/transaction.py \
b/client/rhel/rhn-client-tools/src/up2date_client/transaction.py index \
2fc99bb..e47be20 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/transaction.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/transaction.py
@@ -6,7 +6,7 @@
# Adrian Likins <alikins@redhat.com
#
#
-# a couple of classes wrapping up transactions so that we
+# a couple of classes wrapping up transactions so that we
# can share transactions instead of creating new ones all over
#
@@ -70,7 +70,7 @@ class TransactionData:
pkgInfo[2], pkgInfo[3])
return out
-
+
# wrapper/proxy class for rpm.Transaction so we can
# instrument it, etc easily
class Up2dateTransaction:
@@ -115,7 +115,7 @@ class Up2dateTransaction:
def popVSFlags(self):
del self.tsflags[-1]
self.ts.setVSFlags(self.tsflags[-1])
-
+
def initReadOnlyTransaction():
global read_ts
if read_ts == None:
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py \
b/client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py index \
02280b2..3110e25 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py
@@ -24,10 +24,10 @@ def getSystemId():
path = cfg["systemIdPath"]
if not os.access(path, os.R_OK):
return None
-
+
f = open(path, "r")
ret = f.read()
-
+
f.close()
return ret
@@ -43,10 +43,10 @@ def maybeUpdateVersion():
return 0
systemVer = up2dateUtils.getVersion()
-
+
if idVer != systemVer:
s = rhnserver.RhnServer()
-
+
newSystemId = s.registration.upgrade_version(getSystemId(), systemVer)
path = cfg["systemIdPath"]
@@ -90,7 +90,7 @@ def writeCachedLogin():
return False
data = {'time': time.time(),
'loginInfo': loginInfo}
-
+
pcklDir = os.path.dirname(pcklAuthFileName)
if not os.access(pcklDir, os.W_OK):
try:
@@ -104,7 +104,7 @@ def writeCachedLogin():
pickle.dump(data, pcklAuth)
pcklAuth.close()
expireTime = data['time'] + float(loginInfo['X-RHN-Auth-Expire-Offset'])
- log.log_debug("Wrote pickled loginInfo at ", data['time'], " with expiration of \
", + log.log_debug("Wrote pickled loginInfo at ", data['time'], " with expiration \
of ", expireTime, " seconds.")
return True
@@ -140,9 +140,9 @@ def readCachedLogin():
li = data['loginInfo']
currentTime = time.time()
expireTime = createdTime + float(li['X-RHN-Auth-Expire-Offset'])
- #Check if expired, offset is stored in "X-RHN-Auth-Expire-Offset"
+ #Check if expired, offset is stored in "X-RHN-Auth-Expire-Offset"
log.log_debug("Checking pickled loginInfo, currentTime=", currentTime,
- ", createTime=", createdTime, ", expire-offset=",
+ ", createTime=", createdTime, ", expire-offset=",
float(li['X-RHN-Auth-Expire-Offset']))
if (currentTime > expireTime):
log.log_debug("Pickled loginInfo has expired, created = %s, expire = %s." \
@@ -188,12 +188,12 @@ def login(systemId=None, forceUpdateúlse, timeout=None):
if not systemId:
return None
-
+
maybeUpdateVersion()
log.log_me("logging into up2date server")
li = server.up2date.login(systemId)
-
+
# figure out if were missing any needed caps
server.capabilities.validate()
_updateLoginInfo(li) #update global var, loginInfo
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateLog.py \
b/client/rhel/rhn-client-tools/src/up2date_client/up2dateLog.py index \
6daa772..1fe5c95 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateLog.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateLog.py
@@ -14,18 +14,18 @@ class Log:
self.app = "up2date"
self.cfg = config.initUp2dateConfig()
self.log_info = ''
-
+
def set_app_name(self, name):
self.app = str(name)
-
+
def log_debug(self, *args):
if self.cfg["debug"] > 1:
self.log_me("D: ", *args)
-
+
def log_me(self, *args):
"""General logging function.
Eg: log_me("I am a banana.")
-
+
"""
self.log_info = "[%s] %s" % (time.ctime(time.time()), self.app)
s = u""
@@ -52,9 +52,9 @@ class Log:
output = output + traceback.format_list(traceback.extract_tb(tb))
output.append("%s: %s\n" % (logtype, value))
self.write_log("".join(output))
-
+
def write_log(self, s):
-
+
log_name = self.cfg["logFile"] or "/var/log/up2date"
log_file = open(log_name, 'a')
msg = u"%s %s\n" % (self.log_info, s)
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/yumPlugin.py \
b/client/rhel/rhn-client-tools/src/up2date_client/yumPlugin.py index 4d70c47..73dfe3b \
100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/yumPlugin.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/yumPlugin.py
@@ -5,8 +5,8 @@ import os
import re
import rpm
-# global variables
-YUM_PLUGIN_CONF = '/etc/yum/pluginconf.d/rhnplugin.conf'
+# global variables
+YUM_PLUGIN_CONF = '/etc/yum/pluginconf.d/rhnplugin.conf'
def pluginEnable():
"""Enables yum-rhn-plugin, may throw IOError"""
diff --git a/client/rhel/rhn-client-tools/test/haltreetests.py \
b/client/rhel/rhn-client-tools/test/haltreetests.py index 2fa0ebf..af1161d 100644
--- a/client/rhel/rhn-client-tools/test/haltreetests.py
+++ b/client/rhel/rhn-client-tools/test/haltreetests.py
@@ -28,7 +28,7 @@ class HalDeviceTests(unittest.TestCase):
def test_no_parent(self):
properties = { 'info.udi' : 'foo/bar/disk/3' }
device = haltree.HalDevice(properties)
-
+
self.assertEquals(None, device.parent_udi)
def test_with_parent(self):
@@ -36,7 +36,7 @@ class HalDeviceTests(unittest.TestCase):
properties = { 'info.udi' : 'foo/bar/disk/3',
'info.parent' : parent_udi }
device = haltree.HalDevice(properties)
-
+
self.assertEquals(parent_udi, device.parent_udi)
@@ -46,7 +46,7 @@ class HalTreeTests(unittest.TestCase):
properties = { 'info.udi' : 'foo/bar/computer' }
self.head = haltree.HalDevice(properties)
- properties = { 'info.udi' : 'foo/bar/disk/3',
+ properties = { 'info.udi' : 'foo/bar/disk/3',
'info.parent' : 'foo/bar/computer' }
self.child = haltree.HalDevice(properties)
@@ -54,13 +54,13 @@ class HalTreeTests(unittest.TestCase):
def test_add_head(self):
tree = haltree.HalTree()
tree.add(self.head)
-
+
self.assertEquals(self.head, tree.head)
def test_add_device_no_head(self):
tree = haltree.HalTree()
tree.add(self.child)
-
+
self.assertEquals(None, tree.head)
def test_add_head_single_child_child_first(self):
@@ -91,6 +91,6 @@ def suite():
suite.addTest(unittest.makeSuite(HalDeviceTests))
suite.addTest(unittest.makeSuite(HalTreeTests))
return suite
-
+
if __name__ == "__main__":
unittest.main(defaultTest="suite")
diff --git a/client/rhel/rhn-client-tools/test/testByteRangeRpcServer.py \
b/client/rhel/rhn-client-tools/test/testByteRangeRpcServer.py index d36daeb..10a2b76 \
100755
--- a/client/rhel/rhn-client-tools/test/testByteRangeRpcServer.py
+++ b/client/rhel/rhn-client-tools/test/testByteRangeRpcServer.py
@@ -32,6 +32,6 @@ def suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestClientCaps))
return suite
-
+
if __name__ == "__main__":
unittest.main(argv=sys.argv)
diff --git a/client/rhel/rhn-client-tools/test/testClientCaps.py \
b/client/rhel/rhn-client-tools/test/testClientCaps.py index 4860cf3..db42867 100755
--- a/client/rhel/rhn-client-tools/test/testClientCaps.py
+++ b/client/rhel/rhn-client-tools/test/testClientCaps.py
@@ -87,9 +87,9 @@ class TestClientCaps(unittest.TestCase):
os.makedirs(dirname)
try:
clientCaps.loadLocalCaps(test_clientCaps_d)
- os.rmdir(dirname)
+ os.rmdir(dirname)
except:
- os.rmdir(dirname)
+ os.rmdir(dirname)
self.fail()
@@ -110,6 +110,6 @@ def suite():
suite.addTest(unittest.makeSuite(TestClientCaps))
suite.addTest(unittest.makeSuite(TestLoginWithCaps))
return suite
-
+
if __name__ == "__main__":
unittest.main(defaultTest="suite")
diff --git a/client/rhel/rhn-client-tools/test/testConfig.py \
b/client/rhel/rhn-client-tools/test/testConfig.py index 823f8fa..7ff4a22 100755
--- a/client/rhel/rhn-client-tools/test/testConfig.py
+++ b/client/rhel/rhn-client-tools/test/testConfig.py
@@ -23,9 +23,9 @@ class TestConfig(unittest.TestCase):
pass
def tearDown(self):
- config.cfg == None
+ config.cfg == None
testutils.restoreConfig()
-
+
def testEmptyInit(self):
"Verify that the class can be created with no arguments"
cfg = config.initUp2dateConfig(test_up2date)
@@ -144,8 +144,8 @@ class TestConfig(unittest.TestCase):
"Verify that Config.load() works without exception"
cfg = config.initUp2dateConfig(test_up2date)
cfg.load("/etc/sysconfig/rhn/up2date")
-
-
+
+
def testNetworkConfig(self):
"Verify that the NetworkConfig class can be created"
nc = config.NetworkConfig()
diff --git a/client/rhel/rhn-client-tools/test/testRhnChannel.py \
b/client/rhel/rhn-client-tools/test/testRhnChannel.py index 8285c52..87e0e3c 100755
--- a/client/rhel/rhn-client-tools/test/testRhnChannel.py
+++ b/client/rhel/rhn-client-tools/test/testRhnChannel.py
@@ -36,7 +36,7 @@ class testRhnChannel(unittest.TestCase):
'org_id': '',
'id': '63',
'label': 'redhat-linux-i386-9'}]
-
+
def testGetChannelDetails(self):
"rhnChannel.GetChannelDetails"
res = rhnChannel.getChannelDetails()
@@ -53,7 +53,7 @@ class testRhnChannel(unittest.TestCase):
def testGetChannels(self):
"Test rhnChannel.getChannels()"
res = rhnChannel.getChannels()
-
+
write(res)
def testUpdateChannels(self):
diff --git a/client/rhel/rhn-client-tools/test/testRpcServer.py \
b/client/rhel/rhn-client-tools/test/testRpcServer.py index 0845452..800ee0b 100644
--- a/client/rhel/rhn-client-tools/test/testRpcServer.py
+++ b/client/rhel/rhn-client-tools/test/testRpcServer.py
@@ -40,14 +40,14 @@ class TestGetServer(unittest.TestCase):
def __callback(self):
write("callback called")
-
+
def testGetServerDefaultWithRefreshCallback(self):
"Verify that getServer works with default config and a refreshCallback"
try:
s = rpcServer.getServer(refreshCallback=self.__callback)
except:
self.fail("Got an expection calling rpcServer.getServer")
-
+
def testGetServerRedirectServer(self):
"Verify that getServer works when talking to a server that redirects"
self.cfg['serverURL'] = "https://rhn.redhat.com/XMLRPC-REDIRECT"
@@ -78,8 +78,8 @@ class TestGetServer(unittest.TestCase):
s = rpcServer.getServer()
except:
self.fail("Got an expection calling rpcServer.getServer")
-
-
+
+
def testGetServerAuthProxyNoPassword(self):
"Verify that getSerer works when specifying an an auth proxy and no user \
password" sys.path.append("/etc/sysconfig/rhn/")
@@ -128,7 +128,7 @@ class TestGetServer(unittest.TestCase):
def testGetServerMultipleCaCert(self):
"getServer with a multiple CA certs"
rpcServer.rhns_ca_certs = ["/usr/share/rhn/RHNS-CA-CERT", \
"/usr/share/rhn/RHNS-CA-CERT"]
-
+
try:
s = rpcServer.getServer()
except:
@@ -138,7 +138,7 @@ class TestGetServer(unittest.TestCase):
class TestRpcServer500Error(unittest.TestCase):
def setUp(self):
-
+
self.defaultServer = testConfig.brokenServer500error
import testutils
testutils.setupConfig("fc1-at-pepsi")
@@ -146,7 +146,7 @@ class TestRpcServer500Error(unittest.TestCase):
# cant import config until we put the right stuff in place
self.cfg = config.initUp2dateConfig(test_up2date)
self.cfg['serverURL'] = self.defaultServer
-
+
def tearDown(self):
import testutils
testutils.restoreConfig()
@@ -154,7 +154,7 @@ class TestRpcServer500Error(unittest.TestCase):
def testDefaultWelcomeMessage(self):
"Test welcome_message call with no redirects or proxies"
s = rpcServer.getServer()
-
+
ret = s.registration.welcome_message()
## def testListPackages(self):
@@ -181,7 +181,7 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
self.FourOhFourServerSSL = "https://xmlrpc.rhn.redhat.com/XMLSSDFSD"
self.FourOhFourServer = "http://xmlrpc.rhn.redhat.com/XMLSSDFSD"
unittest.TestCase.__init__(self, methodname)
-
+
def setUp(self):
self.cfg = config.initUp2dateConfig(test_up2date)
self.defaultServer = self.cfg['serverURL']
@@ -193,13 +193,13 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
self.cfg['serverURL'] = self.defaultServer
self.cfg['enableProxy'] = 0
self.cfg['enableAuthProxy'] = 0
-
+
def testDefaultWelcomeMessage(self):
"Test welcome_message call with no redirects or proxies"
s = rpcServer.getServer()
s.registration.welcome_message()
-
+
def testDefaultWelcomeMessageFailoverNonExistentServer(self):
"Test welcome_message call faling over from a non existent server"
self.cfg['serverURL'] = [ self.neServer,
@@ -213,7 +213,7 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
'https://SECRET_URL/XMLRPC']
s = rpcServer.getServer()
s.registration.welcome_message()
-
+
def testDefaultWelcomeMessageFailoverNonExistentServerRedirect(self):
"Test welcome_message call faling over from a non existent server to a \
redirect" self.cfg['serverURL'] = [ self.neServer,
@@ -227,7 +227,7 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
'https://SECRET_URL/XMLRPC-REDIRECT']
s = rpcServer.getServer()
s.registration.welcome_message()
-
+
def testDefaultWelcomeMessageHttpsToHttps(self):
"Test redirecting https to https"
self.cfg['serverURL'] = "https://SECRET_URL/XMLRPC-REDIRECT"
@@ -251,7 +251,7 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
else:
self.fail("IOError expected here but didnt get it")
-
+
def testDefaultWelcomeMessageHttpsToHttpFailovers(self):
"Test redirecting https to http after failing over from bad servers"
self.cfg['serverURL'] = [self.neServer,
@@ -262,7 +262,7 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
try:
s.registration.welcome_message()
except rpclib.InvalidRedirectionError:
-
+
pass
else:
self.fail("InvalidRedirectionError expected here but didnt get it")
@@ -277,7 +277,7 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
try:
s.registration.welcome_message()
except rpclib.InvalidRedirectionError:
-
+
pass
else:
self.fail("InvalidRedirectionError expected here but didnt get it")
@@ -292,12 +292,12 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
try:
s.registration.welcome_message()
except rpclib.InvalidRedirectionError:
-
+
pass
else:
self.fail("InvalidRedirectionError expected here but didnt get it")
-
+
def testDefaultWelcomeMessageHttpsToHttpFailoversSSL(self):
"Test redirecting https to http after failing over from bad ssl servers"
self.cfg['serverURL'] = [self.neServerSSL,
@@ -308,11 +308,11 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
try:
s.registration.welcome_message()
except rpclib.InvalidRedirectionError:
-
+
pass
else:
self.fail("InvalidRedirectionError expected here but didnt get it")
-
+
def testDefaultWelcomeMessageHttpToHttp(self):
"Test redirecting http to http"
self.cfg['serverURL'] = "http://SECRET_URL/XMLRPC-REDIRECT-NOSSL"
@@ -368,7 +368,7 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
pass
else:
self.fail("InvalidRedirectionError expected here but didnt get it")
-
+
def testDefaultWelcomeMessageHttpToHttpRedirectsOff(self):
"Test redirecting http to http and verify if tails with allow_redirect off"
self.cfg['serverURL'] = "http://SECRET_URL/XMLRPC-REDIRECT-NOSSL"
@@ -407,7 +407,7 @@ class TestRpcServerWelcomeMessage(unittest.TestCase):
s.registration.welcome_message()
ret = s.redirected()
self.assertEqual(ret, "https://SECRET_URL/XMLRPC")
-
+
def testDefaultWelcomeMessageHttpsToHttpCheckRedirect(self):
"Test redirecting https to http and verify redirect()"
diff --git a/client/rhel/rhn-client-tools/test/testRpmUtils.py \
b/client/rhel/rhn-client-tools/test/testRpmUtils.py index 84bf4bb..91c1d41 100755
--- a/client/rhel/rhn-client-tools/test/testRpmUtils.py
+++ b/client/rhel/rhn-client-tools/test/testRpmUtils.py
@@ -19,7 +19,7 @@ class TestVerifyPackages(unittest.TestCase):
def __setupData(self):
pass
-
+
def testEmptyLabelList(self):
"Verify that the verifyPackages call with empty list works"
data, missing_packages = pkgUtils.verifyPackages([])
@@ -88,6 +88,6 @@ def suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestVerifyPackages))
return suite
-
+
if __name__ == "__main__":
unittest.main(defaultTest="suite")
diff --git a/client/rhel/rhn-client-tools/test/testSSLSocketTimeout.py \
b/client/rhel/rhn-client-tools/test/testSSLSocketTimeout.py index 361b215..e6c278b \
100755
--- a/client/rhel/rhn-client-tools/test/testSSLSocketTimeout.py
+++ b/client/rhel/rhn-client-tools/test/testSSLSocketTimeout.py
@@ -17,7 +17,7 @@ class TestSomething(unittest.TestCase):
def __setupData(self):
pass
-
+
def testHttpConnection(self):
con = httplib.HTTPConnection("www.adrianlikins.com")
con.request("GET", "/")
@@ -39,13 +39,13 @@ class TestSomething(unittest.TestCase):
con.request("GET", "/")
r1 = con.getresponse()
data = r1.read()
- con.close()
+ con.close()
def suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestSomething))
return suite
-
+
if __name__ == "__main__":
unittest.main(argv=sys.argv)
diff --git a/client/rhel/rhn-client-tools/test/testTransactions.py \
b/client/rhel/rhn-client-tools/test/testTransactions.py index e4d0c97..b4ada21 100755
--- a/client/rhel/rhn-client-tools/test/testTransactions.py
+++ b/client/rhel/rhn-client-tools/test/testTransactions.py
@@ -27,7 +27,7 @@ class TestGetAllPkgInfo(unittest.TestCase):
if multilib:
self.allPkgs.append(["a%04d" % i, '1.0', '1', '', arch1])
self.allPkgs.append(["a%04d" % i, '1.0', '1', '', arch2])
- else:
+ else:
self.allPkgs.append(["a%04d" % i, '1.0', '1', '', arch1])
def setUp(self):
@@ -49,7 +49,7 @@ class TestTransactionData(unittest.TestCase):
self.packages1 = [(('kernel', '2.4.0', '1.0', ''), "u"),
(('blippy', '1.0', '1.0', '', 'i686'), "i")]
-
+
def testPopulateData1(self):
"Verify that populating data set 1 works correctly"
self.td.data['packages'] = self.packages1
@@ -70,7 +70,7 @@ class TestGenTransaction(unittest.TestCase):
self.packages1 = [(('kernel', '2.4.0', '1.0', ''), "u"),
(('blippy', '1.0', '1.0', '', 'i686'), "i")]
-
+
# def testGenTransactionData1(self):
# td = transaction.TransactionData()
# td.data['packages'] = self.packages1
@@ -83,12 +83,12 @@ class TestGenTransactionSat1(unittest.TestCase):
setupflag = 0
def _realSetup(self, testname):
rpm.addMacro("_dbpath",testutils.DBPATH)
- repackagedir = "/tmp/testrepackage"
+ repackagedir = "/tmp/testrepackage"
rpm.addMacro("_repackage_dir", repackagedir)
-
+
if TestGenTransactionSat1.setupflag != 0:
return
-
+
testutils.createDataDirs()
testutils.rebuildRpmDatabase(testname)
testutils.rebuildRepackageDir(testname)
@@ -107,12 +107,12 @@ class TestGenTransactionSat1(unittest.TestCase):
# self.packages1 = [(('kernel', '2.4.0', '1.0', ''), "u"),
# (('blippy', '1.0', '1.0', '', 'i686'), "i")]#
-
+
def tearDown(self):
pass
# testutils.restoreConfig()
-
+
# def testGenTransactionData1(self):
# td = transaction.TransactionData()
@@ -138,12 +138,12 @@ class TestActionsTransactions(unittest.TestCase):
setupflag = 0
def _realSetup(self, testname):
rpm.addMacro("_dbpath",testutils.DBPATH)
- repackagedir = "/tmp/testrepackage"
+ repackagedir = "/tmp/testrepackage"
rpm.addMacro("_repackage_dir", repackagedir)
-
+
if TestGenTransactionSat1.setupflag != 0:
return
-
+
testutils.createDataDirs()
testutils.rebuildRpmDatabase(testname)
testutils.rebuildRepackageDir(testname)
@@ -159,7 +159,7 @@ class TestActionsTransactions(unittest.TestCase):
def __setupData(self):
self.packages1 = [(('wget', '1.8.2', '5', ''), 'u'),
(('cvs', '1.11.2', '8', ''), 'u')]
-
+
def tearDown(self):
pass
@@ -169,7 +169,7 @@ class TestActionsTransactions(unittest.TestCase):
data = {}
data['packages'] = self.packages1
-
+
res = packages.runTransaction(data)
write(res)
diff --git a/client/rhel/rhn-client-tools/test/testUp2dateAuth.py \
b/client/rhel/rhn-client-tools/test/testUp2dateAuth.py index 7d5a1e3..c199f96 100755
--- a/client/rhel/rhn-client-tools/test/testUp2dateAuth.py
+++ b/client/rhel/rhn-client-tools/test/testUp2dateAuth.py
@@ -23,7 +23,7 @@ class TestGetSystemID(unittest.TestCase):
def tearDown(self):
self.cfg['systemIdPath'] = self.sysid
-
+
def testGetSystemId(self):
"Verify that the updateAuth.getSystemId can be called"
id = up2dateAuth.getSystemId()
@@ -35,7 +35,7 @@ class TestGetSystemID(unittest.TestCase):
id = up2dateAuth.getSystemId()
self.assertEqual(id, None)
-
+
class TestMaybeUpdateVersion(unittest.TestCase):
def setUp(self):
self.__setupData()
@@ -51,8 +51,8 @@ class TestMaybeUpdateVersion(unittest.TestCase):
import testutils
testutils.restoreConfig()
self.cfg['versionOverride'] = self.origversion
-
-
+
+
def testMaybeUpdateVersion(self):
"Verify that maybeUpdateVersion works"
ret = up2dateAuth.maybeUpdateVersion()
@@ -109,7 +109,7 @@ class TestLogin(unittest.TestCase):
else:
self.fail("Expected a dict containing headers, but the return is not a \
dict")
-
+
class TestUpdateLoginInfo(unittest.TestCase):
def setUp(self):
self.__setupData()
@@ -127,7 +127,7 @@ class TestUpdateLoginInfo(unittest.TestCase):
"test that up2dateAuth.up2dateLoginInfo works without exceptions"
ret = up2dateAuth.updateLoginInfo()
-
+
def testUpdateLoginInfoCredsType(self):
"Verify that up2dateAuth.updateLoginInfo returns login credentials in a \
dict" ret = up2dateAuth.updateLoginInfo()
@@ -139,7 +139,7 @@ class TestUpdateLoginInfo(unittest.TestCase):
def testUpdateLoginInfoSingleton(self):
"Verify that up2dateAuth.updateLoginInfo returns the proper auth info"
- # test for bugs #124335, #115385
+ # test for bugs #124335, #115385
ret1 = up2dateAuth.updateLoginInfo()
ret2 = up2dateAuth.updateLoginInfo()
assert ret1 == ret2
@@ -160,7 +160,7 @@ class TestUpdateLoginInfo(unittest.TestCase):
# if this doesn't throw an auth traceback, the auth doesnt work
p, t = rpcServer.doCall(rd.listPackages, channel,
msgCallback=None, progressCallback=None)
-
+
def testUp2dateLoginInfoWorks(self):
"Verify that up2dateAuth.updateLoginInfo retuns a working authToken"
@@ -168,7 +168,7 @@ class TestUpdateLoginInfo(unittest.TestCase):
rd = repoDirector.initRepoDirector()
ret2 = up2dateAuth.updateLoginInfo()
self.__verifyTokens(rd)
-
+
#TODO: things we don't test yet but need to
# authToken timeout (need some server magic)
diff --git a/client/rhel/rhn-client-tools/test/testrhnregGui.py \
b/client/rhel/rhn-client-tools/test/testrhnregGui.py index befdae6..4e0a274 100644
--- a/client/rhel/rhn-client-tools/test/testrhnregGui.py
+++ b/client/rhel/rhn-client-tools/test/testrhnregGui.py
@@ -17,30 +17,30 @@ class MyError(Exception):
class TestcallAndFilterExceptions(unittest.TestCase):
def storeMessage(self, message, dummy):
self.message = message
-
+
def returnsNumber(self):
return 6
-
+
def raiseError(self):
raise MyError("I am a banana!")
-
+
def testCallableDoesntRaiseException(self):
- value = callAndFilterExceptions(self.returnsNumber, [], "Error",
+ value = callAndFilterExceptions(self.returnsNumber, [], "Error",
self.storeMessage)
self.assertEqual(value, 6)
-
+
def testCallableRaisesValidException(self):
self.assertRaises(MyError,
- callAndFilterExceptions, self.raiseError,
- [MyError], "Error",
+ callAndFilterExceptions, self.raiseError,
+ [MyError], "Error",
self.storeMessage)
def testCallableRaisesInvalidException(self):
- value = callAndFilterExceptions(self.raiseError, [], "Error3",
+ value = callAndFilterExceptions(self.raiseError, [], "Error3",
self.storeMessage)
self.assertEqual(value, None)
self.assertEqual(self.message, "Error3")
-
+
#TODO: things we don't test yet but need to
# authToken timeout (need some server magic)
# verifying that the authTokens we get actually work
diff --git a/client/rhel/rhn-client-tools/test/testutils.py \
b/client/rhel/rhn-client-tools/test/testutils.py index 4845f2a..5bbc21b 100755
--- a/client/rhel/rhn-client-tools/test/testutils.py
+++ b/client/rhel/rhn-client-tools/test/testutils.py
@@ -12,7 +12,7 @@ DBCACHEPATH="/tmp/testdbcaches/"
UP2DATE_COMMAND="up2date --justdb --dbpath $DBPATH"
DATAPATH="/tmp/datadir"
TOPDIR="../"
-DBDIR="%s/testdbs" % "/usr/src/rhn/test/up2date/depsolve/"
+DBDIR="%s/testdbs" % "/usr/src/rhn/test/up2date/depsolve/"
PKGDIR="%s/testpackages" % "/usr/src/rhn/test/up2date/rollbacks/"
RESULTSPATH="%s/results/" % (TOPDIR)
CONFIGPATH="%s/configs" % "/usr/src/rhn/test/up2date/depsolve/"
@@ -27,7 +27,7 @@ def createDbDir():
#whatever...
print "%s doesnt exist, creating it" % DBPATH
pass
-
+
# make the new
if not os.access(DBPATH, os.W_OK):
os.makedirs(DBPATH)
@@ -40,7 +40,7 @@ def createRepackageDir():
#whatever...
print "%s doesnt exist, creating it" % REPACKAGEDIR
pass
-
+
# make the new
if not os.access(REPACKAGEDIR, os.W_OK):
os.makedirs(REPACKAGEDIR)
@@ -50,7 +50,7 @@ def createRepackageDir():
def createDataDirs():
createDbDir()
createRepackageDir()
-
+
if not os.access(DATAPATH, os.W_OK):
os.makedirs(DATAPATH)
@@ -58,7 +58,7 @@ def createDataDirs():
def rebuildRepackageDir(repackageName):
createRepackageDir()
files = glob.glob("%s/%s/*.rpm" % (PKGDIR, repackageName))
- for file in files:
+ for file in files:
shutil.copy(file , REPACKAGEDIR)
@@ -83,7 +83,7 @@ def populateDbCache(dbname):
def rebuildRpmDatabase(dbname):
createDbDir()
-
+
if lookForDbCache(dbname):
print "Rebuilding rpm database"
shutil.copy("%s/%s/Packages" % (DBDIR,dbname) , DBPATH)
@@ -91,7 +91,7 @@ def rebuildRpmDatabase(dbname):
fd = os.popen(cmdline)
fd.read()
fd.close()
-
+
populateDbCache(dbname)
@@ -106,7 +106,7 @@ def getRpmQAList():
fd = os.popen(cmdline)
tmp = fd.readlines()
out = map(lambda a:string.strip(a), tmp)
-
+
fd.close()
return out
@@ -162,7 +162,7 @@ def logFailures(name):
fd = open("%s/FAILURES" % DATAPATH, "w+")
fd.write("%s\n" % name)
fd.close()
-
+
def runTestcase(testcase):
print "Generating an rpm db in %s based on %s" % (DBPATH, "%s/%s" % \
(DBDIR,testcase.dbname)) rebuildRpmDatabase(testcase.dbname)
@@ -218,7 +218,7 @@ def compareResults(resultsName, afterList):
resultsFile = "%s/%s" % (RESULTSPATH, resultsName)
if not os.access(resultsFile, os.R_OK):
raise "NoResultsError"
-
+
fd = open("%s/%s" % (RESULTSPATH, resultsName), "r")
expected = fd.readlines()
expected.sort()
@@ -233,10 +233,10 @@ def compareResults(resultsName, afterList):
else:
return 1
-
-
+
+
class Testcase:
def __init__(self, name=None, dbname=None,
configs=None, results=None, options=None):
@@ -253,14 +253,14 @@ class Testcase:
out = out + "results: %s" % self.results
out = out + "options: %s " % self.options
return out
-
+
testcases = []
testcasenames = []
def parsefile(m):
while 1:
s = m.readline()
if not len(s):
- break
+ break
s = s[:-1]
if not s:
continue
diff --git a/client/rhel/rhnlib/rhn/SSL.py b/client/rhel/rhnlib/rhn/SSL.py
index db26fd8..471d008 100644
--- a/client/rhel/rhnlib/rhn/SSL.py
+++ b/client/rhel/rhnlib/rhn/SSL.py
@@ -42,7 +42,7 @@ class SSLSocket:
def __init__(self, socket, trusted_certs=None):
# SSL.Context object
self._ctx = None
- # SSL.Connection object
+ # SSL.Connection object
self._connection = None
self._sock = socket
self._trusted_certs = []
@@ -53,7 +53,7 @@ class SSLSocket:
# SSL method to use
self._ssl_method = SSL.SSLv23_METHOD
# Flags to pass to the SSL layer
- self._ssl_verify_flags = SSL.VERIFY_PEER
+ self._ssl_verify_flags = SSL.VERIFY_PEER
# Buffer size for reads
self._buffer_size = 8192
@@ -95,7 +95,7 @@ class SSLSocket:
self._ctx.set_verify(self._ssl_verify_flags, ssl_verify_callback)
if hasattr(SSL, "OP_DONT_INSERT_EMPTY_FRAGMENTS"):
# Certain SSL implementations break when empty fragments are
- # initially sent (even if sending them is compliant to
+ # initially sent (even if sending them is compliant to
# SSL 3.0 and TLS 1.0 specs). Play it safe and disable this
# feature (openssl 0.9.6e and later)
self._ctx.set_options(SSL.OP_DONT_INSERT_EMPTY_FRAGMENTS)
@@ -117,7 +117,7 @@ class SSLSocket:
# that originally called makefile() are gone
self._makefile_called = self._makefile_called + 1
return self
-
+
def close(self):
"""
Closes the SSL connection
@@ -180,7 +180,7 @@ class SSLSocket:
try:
data = self._connection.recv(buffer_size)
-
+
self._buffer = self._buffer + data
buffer_length = len(self._buffer)
@@ -222,8 +222,8 @@ class SSLSocket:
Writes to the SSL connection.
"""
self._check_closed()
-
- # XXX Should use sendall
+
+ # XXX Should use sendall
# sent = self._connection.sendall(data)
origlen = len(data)
while True:
@@ -236,7 +236,7 @@ class SSLSocket:
self._poll(select.POLLOUT, 'write')
except SSL.WantReadError:
self._poll(select.POLLIN, 'write')
-
+
return origlen
def recv(self, amt):
@@ -302,7 +302,7 @@ def ssl_verify_callback(conn, cert, errnum, depth, ok):
return ok
class TimeoutException(SSL.Error, socket.timeout):
-
+
def __init__(self, *args):
self.args = args
diff --git a/client/rhel/rhnlib/rhn/SmartIO.py b/client/rhel/rhnlib/rhn/SmartIO.py
index 764e130..02d1945 100644
--- a/client/rhel/rhnlib/rhn/SmartIO.py
+++ b/client/rhel/rhnlib/rhn/SmartIO.py
@@ -76,7 +76,7 @@ def getDefaultStorage():
except IOError:
return tmpdir
for line in f.readlines():
- if line.startswith("tmpDir="):
+ if line.startswith("tmpDir="):
cfgdir = line.split("=")
if len(cfgdir) > 1:
tmpdir = cfgdir[-1].strip() or tmpdir
diff --git a/client/rhel/rhnlib/rhn/UserDictCase.py \
b/client/rhel/rhnlib/rhn/UserDictCase.py index e6c217b..cb55674 100644
--- a/client/rhel/rhnlib/rhn/UserDictCase.py
+++ b/client/rhel/rhnlib/rhn/UserDictCase.py
@@ -43,7 +43,7 @@ class UserDictCase(UserDict):
key = self.__lower_string(key)
if not self.data.has_key(key):
return None
- return self.data[key]
+ return self.data[key]
get = __getitem__
@@ -64,13 +64,13 @@ class UserDictCase(UserDict):
def clear(self):
self.data.clear()
- self.kcase.clear()
+ self.kcase.clear()
# return this data as a real hash
def get_hash(self):
return reduce(lambda a, (ik, v), hc=self.kcase:
a.update({ hc[ik] : v}) or a, self.data.items(), {})
-
+
# return the data for marshalling
def __getstate__(self):
return self.get_hash()
diff --git a/client/rhel/rhnlib/rhn/__init__.py b/client/rhel/rhnlib/rhn/__init__.py
index c200b3e..48fa802 100644
--- a/client/rhel/rhnlib/rhn/__init__.py
+++ b/client/rhel/rhnlib/rhn/__init__.py
@@ -2,7 +2,7 @@
# __init__.py
#
# Copyright (c) 2011--2013 Red Hat, Inc.
-#
+#
"""
rhn - A collection of modules used by Red Hat Network Classic
"""
diff --git a/client/rhel/rhnlib/rhn/connections.py \
b/client/rhel/rhnlib/rhn/connections.py index c237fc4..281aac8 100644
--- a/client/rhel/rhnlib/rhn/connections.py
+++ b/client/rhel/rhnlib/rhn/connections.py
@@ -28,7 +28,7 @@ class HTTPResponse(httplib.HTTPResponse):
class HTTPConnection(httplib.HTTPConnection):
response_class = HTTPResponse
-
+
def __init__(self, host, port=None, timeout=SSL.DEFAULT_TIMEOUT):
if python_version() >= '2.6.1':
httplib.HTTPConnection.__init__(self, host, port, timeout=timeout)
@@ -85,7 +85,7 @@ class HTTPConnection(httplib.HTTPConnection):
response = self.response_class(self.sock, self.debuglevel)
else:
response = self.response_class(self.sock)
-
+
# The only modification compared to the stock HTTPConnection
if self._cb_callback:
response.set_callback(self._cb_rs, self._cb_ws, self._cb_ex,
@@ -141,7 +141,7 @@ class HTTPProxyConnection(HTTPConnection):
HTTPConnection.putrequest(self, method, newurl, skip_host=skip_host)
# Add proxy-specific headers
self._add_proxy_headers()
-
+
def _add_proxy_headers(self):
if not self.__username:
return
@@ -149,7 +149,7 @@ class HTTPProxyConnection(HTTPConnection):
userpass = "%s:%s" % (self.__username, self.__password)
enc_userpass = base64.encodestring(userpass).replace("\n", "")
self.putheader("Proxy-Authorization", "Basic %s" % enc_userpass)
-
+
class HTTPSConnection(HTTPConnection):
response_class = HTTPResponse
default_port = httplib.HTTPSConnection.default_port
@@ -196,7 +196,7 @@ class HTTPSProxyResponse(HTTPResponse):
class HTTPSProxyConnection(HTTPProxyConnection):
default_port = HTTPSConnection.default_port
- def __init__(self, proxy, host, port=None, username=None, password=None,
+ def __init__(self, proxy, host, port=None, username=None, password=None,
trusted_certs=None, timeout=SSL.DEFAULT_TIMEOUT):
HTTPProxyConnection.__init__(self, proxy, host, port, username,
password, timeout=timeout)
@@ -206,7 +206,7 @@ class HTTPSProxyConnection(HTTPProxyConnection):
def connect(self):
# Set the connection with the proxy
HTTPProxyConnection.connect(self)
- # Use the stock HTTPConnection putrequest
+ # Use the stock HTTPConnection putrequest
host = "%s:%s" % (self._host, self._port)
HTTPConnection.putrequest(self, "CONNECT", host)
# Add proxy-specific stuff
@@ -216,7 +216,7 @@ class HTTPSProxyConnection(HTTPProxyConnection):
# Save the response class
response_class = self.response_class
# And replace the response class with our own one, which does not
- # close the connection after
+ # close the connection after
self.response_class = HTTPSProxyResponse
response = HTTPConnection.getresponse(self)
# Restore the response class
diff --git a/client/rhel/rhnlib/rhn/nonblocking.py \
b/client/rhel/rhnlib/rhn/nonblocking.py index 0d84cce..5c2abaf 100644
--- a/client/rhel/rhnlib/rhn/nonblocking.py
+++ b/client/rhel/rhnlib/rhn/nonblocking.py
@@ -19,13 +19,13 @@ class NonBlockingFile:
self.user_data = None
self.callback = None
- def set_callback(self, read_fd_set, write_fd_set, exc_fd_set,
+ def set_callback(self, read_fd_set, write_fd_set, exc_fd_set,
user_data, callback):
self.read_fd_set = read_fd_set
# Make the objects non-blocking
for f in self.read_fd_set:
fcntl.fcntl(f.fileno(), fcntl.F_SETFL, os.O_NDELAY)
-
+
self.write_fd_set = write_fd_set
self.exc_fd_set = exc_fd_set
self.user_data = user_data
diff --git a/client/rhel/rhnlib/rhn/rpclib.py b/client/rhel/rhnlib/rhn/rpclib.py
index 0ba18cc..9c60178 100644
--- a/client/rhel/rhnlib/rhn/rpclib.py
+++ b/client/rhel/rhnlib/rhn/rpclib.py
@@ -75,7 +75,7 @@ def split_host(hoststring):
host = arr[0]
if len(arr) == 2:
port = arr[1]
-
+
return (host, port, user, passwd)
def get_proxy_info(proxy):
@@ -86,9 +86,9 @@ def get_proxy_info(proxy):
if len(arr) == 2:
# scheme found, strip it
proxy = arr[1]
-
+
return split_host(proxy)
-
+
class MalformedURIError(IOError):
pass
@@ -126,7 +126,7 @@ class Server:
_transport_class_https = transports.SafeTransport
_transport_class_proxy = transports.ProxyTransport
_transport_class_https_proxy = transports.SafeProxyTransport
- def __init__(self, uri, transport=None, encoding=None, verbose=0,
+ def __init__(self, uri, transport=None, encoding=None, verbose=0,
proxy=None, username=None, password=None, refreshCallback=None,
progressCallback=None, timeout=None):
# establish a "logical" server connection
@@ -149,7 +149,7 @@ class Server:
if pw is not None and password is None:
password = pw
-
+
self._uri = uri
self._refreshCallback = None
self._progressCallback = None
@@ -176,7 +176,7 @@ class Server:
# set up independantly
#
self._allow_redirect = 0
-
+
self._redirected = None
self.use_handler_path = 1
self._transport = transport
@@ -199,10 +199,10 @@ class Server:
timeout=None):
if proxy:
if type == 'https':
- transport = self._transport_class_https_proxy(proxy,
+ transport = self._transport_class_https_proxy(proxy,
proxyUsername=username, proxyPassword=password, timeout=timeout)
else:
- transport = self._transport_class_proxy(proxy,
+ transport = self._transport_class_proxy(proxy,
proxyUsername=username, proxyPassword=password, timeout=timeout)
else:
if type == 'https':
@@ -342,7 +342,7 @@ class Server:
return tuple(result)
def _request(self, methodname, params):
- """ Call a method on the remote server
+ """ Call a method on the remote server
we can handle redirections. """
# the loop is used to handle redirections
redirect_response = 0
@@ -361,11 +361,11 @@ class Server:
self._transport.set_header(k, v)
self._transport.add_header("X-Info",
- 'RPC Processor (C) Red Hat, Inc (version %s)' %
+ 'RPC Processor (C) Red Hat, Inc (version %s)' %
self.rpc_version)
# identify the capability set of this client to the server
self._transport.set_header("X-Client-Version", 1)
-
+
if self._allow_redirect:
# Advertise that we follow redirects
#changing the version from 1 to 2 to support backward compatibility
@@ -405,12 +405,12 @@ class Server:
if not self._allow_redirect:
raise InvalidRedirectionError("Redirects not allowed")
-
+
if self._verbose:
print "%s redirected to %s" % (self._uri, self._redirected)
typ, uri = urllib.splittype(self._redirected)
-
+
if typ != None:
typ = typ.lower()
if typ not in ("http", "https"):
@@ -449,7 +449,7 @@ class Server:
if isinstance(response, transports.File):
# Just return the file
return response
-
+
# an XML-RPC encoded data structure
if isinstance(response, TupleType) and len(response) == 1:
response = response[0]
@@ -513,7 +513,7 @@ class Server:
self._lang = lang
if self._transport and hasattr(self._transport, "setlang"):
self._transport.setlang(lang)
-
+
# Sets the CA chain to be used
def use_CA_chain(self, ca_chain = None):
raise NotImplementedError, "This method is deprecated"
@@ -522,7 +522,7 @@ class Server:
self._trusted_cert_files.append(certfile)
if self._transport and hasattr(self._transport, "add_trusted_cert"):
self._transport.add_trusted_cert(certfile)
-
+
def close(self):
if self._transport:
self._transport.close()
@@ -533,7 +533,7 @@ class GETServer(Server):
def __init__(self, uri, transport=None, proxy=None, username=None,
password=None, client_version=2, headers={}, refreshCallback=None,
progressCallback=None, timeout=None):
- Server.__init__(self, uri,
+ Server.__init__(self, uri,
proxy=proxy,
username=username,
password=password,
@@ -559,12 +559,12 @@ class GETServer(Server):
#save the constructed handler in case of redirect
self.send_handler = self._handler
-
+
# Add headers
#override the handler to replace /XMLRPC with pkg path
if self._redirected and not self.use_handler_path:
self._handler = self._new_req_body()
-
+
for h, v in self._headers.items():
self._transport.set_header(h, v)
@@ -588,7 +588,7 @@ class GETServer(Server):
type, tmpuri = urllib.splittype(self._redirected)
site, handler = urllib.splithost(tmpuri)
return handler
-
+
def set_range(self, offset=None, amount=None):
if offset is not None:
try:
@@ -606,7 +606,7 @@ class GETServer(Server):
if amount <= 0:
raise RangeError("Invalid value `%s' for amount" % amount)
-
+
self._amount = amount
self._offset = offset
@@ -636,7 +636,7 @@ def getHeaderValues(headers, name):
return [headers[name]]
return []
- return map(lambda x: x.split(':', 1)[1].strip(),
+ return map(lambda x: x.split(':', 1)[1].strip(),
headers.getallmatchingheaders(name))
class _Method:
@@ -671,7 +671,7 @@ class SlicingMethod(_Method):
self._offset = kwargs.get('offset')
self._amount = kwargs.get('amount')
- # im_self is a pointer to self, so we can modify the class underneath
+ # im_self is a pointer to self, so we can modify the class underneath
try:
self._send.im_self.set_range(offset=self._offset,
amount=self._amount)
@@ -687,7 +687,7 @@ class SlicingMethod(_Method):
pass
return result
-
+
def reportError(headers):
""" Reports the error from the headers. """
diff --git a/client/rhel/rhnlib/rhn/transports.py \
b/client/rhel/rhnlib/rhn/transports.py index 6a6a29d..d6c46b3 100644
--- a/client/rhel/rhnlib/rhn/transports.py
+++ b/client/rhel/rhnlib/rhn/transports.py
@@ -5,7 +5,7 @@
#
# Author: Mihai Ibanescu <misa@redhat.com>
# Based on what was previously shipped as cgiwrap:
-# - Cristian Gafton <gafton@redhat.com>
+# - Cristian Gafton <gafton@redhat.com>
# - Erik Troan <ewt@redhat.com>
# $Id$
@@ -63,7 +63,7 @@ class Transport(xmlrpclib.Transport):
self.refreshCallback = refreshCallback
# set the buffer size
- # The bigger this is, the faster the read is, but the more seldom is the
+ # The bigger this is, the faster the read is, but the more seldom is the
# progress callback called
def set_buffer_size(self, bufferSize):
if bufferSize is None:
@@ -77,7 +77,7 @@ class Transport(xmlrpclib.Transport):
if method not in ("GET", "POST"):
raise IOError, "Unknown request method %s" % method
self.method = method
-
+
# reset the transport options
def set_transport_flags(self, transfer=None, encoding=None, **kwargs):
# For backwards compatibility, we keep transfer and encoding as
@@ -130,15 +130,15 @@ class Transport(xmlrpclib.Transport):
return connections.HTTPConnection(host, timeout=self.timeout)
else:
return connections.HTTPConnection(host)
-
+
def request(self, host, handler, request_body, verbose=0):
# issue XML-RPC request
# XXX: automatically compute how to send depending on how much data
# you want to send
-
+
# XXX Deal with HTTP/1.1 if necessary
self.verbose = verbose
-
+
# implement BASIC HTTP AUTHENTICATION
host, extra_headers, x509 = self.get_host_info(host)
if not extra_headers:
@@ -167,9 +167,9 @@ class Transport(xmlrpclib.Transport):
# Host and Content-Length are set by HTTP*Connection
for h in ['Content-Length', 'Host']:
req.clear_header(h)
-
+
headers, fd = req.send_http(host, handler)
-
+
if self.verbose:
print "Incoming headers:"
for header, value in headers.items():
@@ -191,9 +191,9 @@ class Transport(xmlrpclib.Transport):
# Now use the Input class in case we get an enhanced response
resp = Input(self.headers_in, progressCallback=self.progressCallback,
bufferSize=self.bufferSize)
-
+
fd = resp.decode(fd)
-
+
if isinstance(fd, InputStream):
# When the File object goes out of scope, so will the InputStream;
# that will eventually call the connection's close() method and
@@ -239,14 +239,14 @@ class Transport(xmlrpclib.Transport):
p.close()
return u.close()
-
+
def setlang(self, lang):
self._lang = lang
class SafeTransport(Transport):
def __init__(self, transfer=0, encoding=0, refreshCallback=None,
progressCallback=None, trusted_certs=None, timeout=None):
- Transport.__init__(self, transfer, encoding,
+ Transport.__init__(self, transfer, encoding,
refreshCallback=refreshCallback, progressCallback=progressCallback,
timeout=timeout)
self.trusted_certs = []
@@ -291,16 +291,16 @@ class ProxyTransport(Transport):
username=self._proxy_username, password=self._proxy_password,
timeout=self.timeout)
else:
- return connections.HTTPProxyConnection(self._proxy, host,
+ return connections.HTTPProxyConnection(self._proxy, host,
username=self._proxy_username, password=self._proxy_password)
class SafeProxyTransport(ProxyTransport):
def __init__(self, proxy, proxyUsername=None, proxyPassword=None,
transfer=0, encoding=0, refreshCallback=None,
progressCallback=None, trusted_certs=None, timeout=None):
- ProxyTransport.__init__(self, proxy,
+ ProxyTransport.__init__(self, proxy,
proxyUsername=proxyUsername, proxyPassword=proxyPassword,
- transfer=transfer, encoding=encoding,
+ transfer=transfer, encoding=encoding,
refreshCallback=refreshCallback,
progressCallback=progressCallback,
timeout=timeout)
@@ -318,12 +318,12 @@ class SafeProxyTransport(ProxyTransport):
print "Connecting via https to %s proxy %s, username %s, pass %s" % (
host, self._proxy, self._proxy_username, self._proxy_password)
if self.timeout:
- return connections.HTTPSProxyConnection(self._proxy, host,
- username=self._proxy_username, password=self._proxy_password,
+ return connections.HTTPSProxyConnection(self._proxy, host,
+ username=self._proxy_username, password=self._proxy_password,
trusted_certs=self.trusted_certs, timeout=self.timeout)
else:
- return connections.HTTPSProxyConnection(self._proxy, host,
- username=self._proxy_username, password=self._proxy_password,
+ return connections.HTTPSProxyConnection(self._proxy, host,
+ username=self._proxy_username, password=self._proxy_password,
trusted_certs=self.trusted_certs)
# ===========================================================================@@ \
-362,7 +362,7 @@ class Input: self.progressCallback = progressCallback
self.bufferSize = bufferSize
self.max_mem_size = max_mem_size
-
+
if not headers:
# we need to get them from environment
if os.environ.has_key("HTTP_CONTENT_TRANSFER_ENCODING"):
@@ -404,17 +404,17 @@ class Input:
self.lang = value.lower()
elif h == "x-package-filename":
self.name = value
-
+
self.io = None
-
+
def read(self, fd = sys.stdin):
# The octet-streams are passed right back
if self.type == "application/octet-stream":
return
-
+
if self.length:
# Read exactly the amount of data we were told
- self.io = _smart_read(fd, self.length,
+ self.io = _smart_read(fd, self.length,
bufferSize=self.bufferSize,
progressCallback=self.progressCallback,
max_mem_size=self.max_mem_size)
@@ -437,7 +437,7 @@ class Input:
# The octet-stream data are passed right back
if self.type == "application/octet-stream":
return InputStream(fd, self.length, self.name, closeý.close)
-
+
if not self.io:
self.read(fd)
@@ -471,7 +471,7 @@ class Input:
self.length = len(data)
self.io = SmartIO(max_mem_size=self.max_mem_size)
self.io.write(data)
- elif self.encoding == "x-gpg":
+ elif self.encoding == "x-gpg":
# XXX: should be written
raise NotImplementedError(self.transfer, self.encoding)
else:
@@ -480,11 +480,11 @@ class Input:
# Play nicely and rewind the file descriptor
self.io.seek(0, 0)
return self.io
-
+
def getlang(self):
return self.lang
-# Utility functions
+# Utility functions
def _smart_total_read(fd, bufferSize24, max_mem_size384):
"""
@@ -513,14 +513,14 @@ def _smart_read(fd, amt, bufferSize24, progressCallback=None,
# Unlike read(), _smart_read tries to return exactly the requested amount
# (whereas read will return _up_to_ that amount). Reads from sockets will
# usually reaturn less data, or the read can be interrupted
- #
+ #
# Inspired by Greg Stein's httplib.py (the standard in python 2.x)
#
# support for progress callbacks added
startTime = time.time()
lastTime = startTime
buf = SmartIO(max_mem_size=max_mem_size)
-
+
origsize = amt
while amt > 0:
curTime = time.time()
@@ -545,7 +545,7 @@ def _smart_read(fd, amt, bufferSize24, progressCallback=None,
lastTime = curTime
# use float() so that we force float division in the next step
bytesRead = float(origsize - amt)
- # if amt == 0, on a fast machine it is possible to have
+ # if amt == 0, on a fast machine it is possible to have
# curTime - lastTime == 0, so add an epsilon to prevent a division
# by zero
speed = bytesRead / ((curTime - startTime) + .000001)
@@ -557,7 +557,7 @@ def _smart_read(fd, amt, bufferSize24, progressCallback=None,
# of 0 length; but that's impossible since we already checked
# that l is non-null
secs = amt / speed
- progressCallback(bytesRead, origsize, speed, secs)
+ progressCallback(bytesRead, origsize, speed, secs)
# Now rewind the SmartIO
buf.seek(0, 0)
@@ -577,13 +577,13 @@ class InputStream:
# =========================================================================== # \
Output class that will be used to build the temporary output string class \
BaseOutput:
- # DEFINES for instances use
+ # DEFINES for instances use
# Content-Encoding
ENCODE_NONE = 0
ENCODE_GZIP = 1
ENCODE_ZLIB = 2
ENCODE_GPG = 3
-
+
# Content-Transfer-Encoding
TRANSFER_NONE = 0
TRANSFER_BINARY = 1
@@ -631,7 +631,7 @@ class BaseOutput:
# internal flags
self.__processed = 0
-
+
def set_header(self, name, arg):
if type(arg) in [ type([]), type(()) ]:
# Multi-valued header
@@ -691,7 +691,7 @@ class BaseOutput:
self.set_header("Content-Transfer-Encoding", transfer_name)
self.set_header("Content-Type", "text/base64")
self.data = base64.encodestring(self.data)
-
+
self.set_header("Content-Length", len(self.data))
rpc_version = __version__
@@ -700,10 +700,10 @@ class BaseOutput:
# other headers
self.set_header("X-Transport-Info",
- 'Extended Capabilities Transport (C) Red Hat, Inc (version %s)' %
+ 'Extended Capabilities Transport (C) Red Hat, Inc (version %s)' %
rpc_version)
self.__processed = 1
-
+
# reset the transport options
def set_transport_flags(self, transfer=0, encoding=0, **kwargs):
self.transfer = transfer
@@ -719,16 +719,16 @@ class BaseOutput:
if self._connection is None:
raise Exception("No connection object found")
self._connection.connect()
- self._connection.request(self.method, handler, body=self.data,
+ self._connection.request(self.method, handler, body=self.data,
headers=self.headers)
-
+
response = self._connection.getresponse()
if not self.response_acceptable(response):
- raise xmlrpclib.ProtocolError("%s %s" %
+ raise xmlrpclib.ProtocolError("%s %s" %
(self._host, handler),
response.status, response.reason, response.msg)
-
+
# A response object has read() and close() methods, so we can safely
# pass the whole object back
return response.msg, response
@@ -825,13 +825,13 @@ class File:
break
file.write(buf)
return file
-
+
def _get_file(self):
"""Read everything into a temporary file and call the progress
callbacks if the file length is defined, or just reads till EOF"""
if self.length:
io = _smart_read(self.file_obj, self.length,
- bufferSize=self.bufferSize,
+ bufferSize=self.bufferSize,
progressCallback=self.progressCallback)
io.seek(0, 0)
else:
diff --git a/client/rhel/rhnlib/test/00-connection.py \
b/client/rhel/rhnlib/test/00-connection.py index 907a3d5..7e13b8f 100755
--- a/client/rhel/rhnlib/test/00-connection.py
+++ b/client/rhel/rhnlib/test/00-connection.py
@@ -45,7 +45,7 @@ def get_test_server_http():
global SERVER, HANDLER
return Server("http://%s%s" % (SERVER, HANDLER))
-
+
if __name__ == '__main__':
systemid = open(system_id_file).read()
@@ -59,5 +59,5 @@ if __name__ == '__main__':
s = gs()
print "--- %s ---" % gs
print s.up2date.login(systemid)
-
+
diff --git a/client/rhel/rhnlib/test/02-callbacks.py \
b/client/rhel/rhnlib/test/02-callbacks.py index 009ce0c..bf7d3a5 100755
--- a/client/rhel/rhnlib/test/02-callbacks.py
+++ b/client/rhel/rhnlib/test/02-callbacks.py
@@ -39,7 +39,7 @@ if __name__ == '__main__':
channels = dict['X-RHN-Auth-Channels']
cn, cv = channels[0][:2]
-
+
print "Calling listPackages"
l = gs.listPackages(cn, cv)
for p in l:
@@ -48,7 +48,7 @@ if __name__ == '__main__':
break
else:
raise Exception("Package not found")
-
+
print "PACKAGE TO DOWNLOAD: %s %s %s %s" % (package[0], package[1], package[2], \
package[4])
filename = "%s-%s-%s.%s.rpm" % (package[0], package[1], package[2], package[4])
print "Calling getPackages"
diff --git a/client/rhel/rhnlib/test/03-nonblocking.py \
b/client/rhel/rhnlib/test/03-nonblocking.py index 11bd243..93961ab 100644
--- a/client/rhel/rhnlib/test/03-nonblocking.py
+++ b/client/rhel/rhnlib/test/03-nonblocking.py
@@ -1,7 +1,7 @@
import socket
import sys
sys.path.append('..')
-from rhn.connections import HTTPConnection
+from rhn.connections import HTTPConnection
def callback(r, w, x, u):
print "Callback called"
diff --git a/client/rhel/rhnlib/test/04-authenticated-proxy.py \
b/client/rhel/rhnlib/test/04-authenticated-proxy.py index 4e0446b..ba1e40b 100755
--- a/client/rhel/rhnlib/test/04-authenticated-proxy.py
+++ b/client/rhel/rhnlib/test/04-authenticated-proxy.py
@@ -2,7 +2,7 @@
#
#
#
-# $Id$
+# $Id$
#
# Usage: $0 SERVER PROXY:PORT [SYSTEMID] [PROXY_USER] [PROXY_PASS]
@@ -18,7 +18,7 @@ PROXY_USERNAME = None
PROXY_PASSWORD = None
system_id_file = '/etc/sysconfig/rhn/systemid'
-if len(sys.argv) < 3:
+if len(sys.argv) < 3:
print "Non efficient cmd-line arguments! Provide at least server & proxy!"
sys.exit(1);
@@ -43,7 +43,7 @@ def get_test_server_proxy_https():
return Server("https://%s%s" % (SERVER, HANDLER), proxy=PROXY,
username=PROXY_USERNAME, password=PROXY_PASSWORD)
-
+
if __name__ == '__main__':
systemid = open(system_id_file).read()
diff --git a/client/rhel/rhnlib/test/05-delete-packages.py \
b/client/rhel/rhnlib/test/05-delete-packages.py index 2aaf081..887e871 100644
--- a/client/rhel/rhnlib/test/05-delete-packages.py
+++ b/client/rhel/rhnlib/test/05-delete-packages.py
@@ -39,4 +39,4 @@ if __name__ == '__main__':
result = s.registration.delete_packages(systemid, packages[:1000]);
sys.exit(result);
-
+
diff --git a/client/rhel/rhnlib/test/07-leaking-ssl-fd.py \
b/client/rhel/rhnlib/test/07-leaking-ssl-fd.py index 89b48e5..3561041 100644
--- a/client/rhel/rhnlib/test/07-leaking-ssl-fd.py
+++ b/client/rhel/rhnlib/test/07-leaking-ssl-fd.py
@@ -32,7 +32,7 @@ class makeAttempts(Thread):
def run(self):
global system_id_file
systemid = open(system_id_file).read()
-
+
dict = self.server.up2date.login(systemid)
channels = dict['X-RHN-Auth-Channels']
c = channels[0]
diff --git a/client/rhel/rhnlib/test/10-tempfile.py \
b/client/rhel/rhnlib/test/10-tempfile.py index 58326c1..f088c0e 100755
--- a/client/rhel/rhnlib/test/10-tempfile.py
+++ b/client/rhel/rhnlib/test/10-tempfile.py
@@ -43,7 +43,7 @@ if __name__ == '__main__':
failed = True;
del ret
-
+
print "Running without saving object references"
for i in range(1000):
print "Running", i
diff --git a/client/rhel/rhnlib/test/12-Input-Output.py \
b/client/rhel/rhnlib/test/12-Input-Output.py index 6db672c..9ebef25 100644
--- a/client/rhel/rhnlib/test/12-Input-Output.py
+++ b/client/rhel/rhnlib/test/12-Input-Output.py
@@ -29,6 +29,6 @@ if __name__ == '__main__':
for transfer in range(3):
for encoding in range(3):
tests.append((transfer, encoding))
-
+
for test in tests:
t(test[0], test[1])
diff --git a/client/rhel/rhnlib/test/13-safe_read.py \
b/client/rhel/rhnlib/test/13-safe_read.py index 0b4bc49..1ec7c09 100755
--- a/client/rhel/rhnlib/test/13-safe_read.py
+++ b/client/rhel/rhnlib/test/13-safe_read.py
@@ -20,7 +20,7 @@ class SlowSocket:
def read(self, amt=None):
time.sleep(.01)
return self._buf.read(amt)
-
+
def __getattr__(self, name):
return getattr(self._buf, name)
@@ -48,7 +48,7 @@ def openedFiles():
global pid
path = '/proc/' + pid + '/fd/';
return len(glob.glob(os.path.join(path, '*')));
-
+
if __name__ == '__main__':
global pid
diff --git a/client/rhel/rhnlib/test/14-Input-Output.py \
b/client/rhel/rhnlib/test/14-Input-Output.py index 454fad4..42be61c 100644
--- a/client/rhel/rhnlib/test/14-Input-Output.py
+++ b/client/rhel/rhnlib/test/14-Input-Output.py
@@ -7,7 +7,7 @@
# 2004-11-29: fails, but it looks like it never worked. Need to investigate
import string
-import sys
+import sys
sys.path.append('..')
from rhn import transports
import xmlrpclib
@@ -63,7 +63,7 @@ if __name__ == '__main__':
for transfer in range(3):
for encoding in range(3):
tests.append((transfer, encoding))
-
+
for test in tests:
test_xmlrpc(test[0], test[1])
test_blob(test[0], test[1])
diff --git a/client/rhel/rhnlib/test/15-ranges.py \
b/client/rhel/rhnlib/test/15-ranges.py index ea4447d..dc69136 100644
--- a/client/rhel/rhnlib/test/15-ranges.py
+++ b/client/rhel/rhnlib/test/15-ranges.py
@@ -4,7 +4,7 @@
#
# $Id$
-import sys
+import sys
sys.path.append('..')
from rhn import rpclib
diff --git a/client/rhel/rhnlib/test/16-test-ranges.py \
b/client/rhel/rhnlib/test/16-test-ranges.py index 0e06f6a..9a4238f 100644
--- a/client/rhel/rhnlib/test/16-test-ranges.py
+++ b/client/rhel/rhnlib/test/16-test-ranges.py
@@ -4,7 +4,7 @@
#
# $Id$
-import sys
+import sys
sys.path.append('..')
from rhn import rpclib
diff --git a/client/rhel/rhnlib/test/19-redirects.py \
b/client/rhel/rhnlib/test/19-redirects.py index 12cbd69..dd72eab 100755
--- a/client/rhel/rhnlib/test/19-redirects.py
+++ b/client/rhel/rhnlib/test/19-redirects.py
@@ -49,7 +49,7 @@ def main():
def run_test(url, allow_redirect, should_fail, text_message):
global SYSTEM_ID
-
+
message = "Running test: %s" % text_message
print message,
@@ -73,7 +73,7 @@ def run_test(url, allow_redirect, should_fail, text_message):
print "PASS"
return 0
-
+
if __name__ == '__main__':
sys.exit(main() or 0)
diff --git a/client/rhel/rhnlib/test/20-proxy-user-agent.py \
b/client/rhel/rhnlib/test/20-proxy-user-agent.py index 03274b3..155c662 100755
--- a/client/rhel/rhnlib/test/20-proxy-user-agent.py
+++ b/client/rhel/rhnlib/test/20-proxy-user-agent.py
@@ -4,7 +4,7 @@
#
# $Id$
#
-# Usage: $0 SERVER PROXY
+# Usage: $0 SERVER PROXY
import sys
diff --git a/client/rhel/rhnlib/test/23-digest-auth.py \
b/client/rhel/rhnlib/test/23-digest-auth.py index 9310191..6eb3eb7 100755
--- a/client/rhel/rhnlib/test/23-digest-auth.py
+++ b/client/rhel/rhnlib/test/23-digest-auth.py
@@ -9,7 +9,7 @@
# Few notes about what is done here:
# - thread AUTH sends authentication digest
# - thread NC uses netcat and grep to see results
-# - Little hack with (echo -n) is much more easier to use,
+# - Little hack with (echo -n) is much more easier to use,
# than some settrace machinary
import sys
@@ -71,7 +71,7 @@ def authenticate():
except socket.error, e:
# nobody is listenning, try to authenticate again
connected = False;
- pass;
+ pass;
except httplib.BadStatusLine, e:
# This is ok, netcat does not send apropriate response
pass
@@ -92,7 +92,7 @@ if __name__ == '__main__':
global nc, auth
nc = killable(target = netcat);
auth = killable(target = authenticate);
-
+
nc.start();
auth.start();
diff --git a/client/rhel/rhnlib/test/24-ssl-memleak.py \
b/client/rhel/rhnlib/test/24-ssl-memleak.py index 6f59dc9..036a19f 100755
--- a/client/rhel/rhnlib/test/24-ssl-memleak.py
+++ b/client/rhel/rhnlib/test/24-ssl-memleak.py
@@ -19,7 +19,7 @@ def main():
ca_cert = sys.argv[2]
except:
pass
- server_url = "https://" + server_name + "/APPLET"
+ server_url = "https://" + server_name + "/APPLET"
mem_usage = None
mem_usage_VmSize_max = None
@@ -53,7 +53,7 @@ def run_test(server_url, ca_cert):
s.add_trusted_cert(ca_cert)
status = s.applet.poll_status()
-
+
def mem_usage():
f = open("/proc/self/status")
diff --git a/client/rhel/rhnlib/test/25-ssl-memleak.py \
b/client/rhel/rhnlib/test/25-ssl-memleak.py index f30dc2f..5859fd6 100644
--- a/client/rhel/rhnlib/test/25-ssl-memleak.py
+++ b/client/rhel/rhnlib/test/25-ssl-memleak.py
@@ -42,7 +42,7 @@ def main():
print "Test PASSES"
return 0
-
+
def run_test(server_name, server_port, ca_cert):
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
diff --git a/client/rhel/rhnlib/test/26-ssl-bad-cert.py \
b/client/rhel/rhnlib/test/26-ssl-bad-cert.py index 2a672f8..bd87a28 100644
--- a/client/rhel/rhnlib/test/26-ssl-bad-cert.py
+++ b/client/rhel/rhnlib/test/26-ssl-bad-cert.py
@@ -14,7 +14,7 @@ def main():
server_name = "www.redhat.com"
server_port = 443
ca_cert = "/usr/share/rhn/RHNS-CA-CERT"
-
+
try:
run_test(server_name, server_port, ca_cert)
except SSL.SSL.Error, e:
diff --git a/client/rhel/rhnlib/test/__init__.py \
b/client/rhel/rhnlib/test/__init__.py index 67e4631..65b74ff 100644
--- a/client/rhel/rhnlib/test/__init__.py
+++ b/client/rhel/rhnlib/test/__init__.py
@@ -4,12 +4,12 @@ import test_server
def testSuite():
suite = unittest.TestSuite()
loader = unittest.TestLoader()
-
+
"""
def testModule(module):
import module
suite.addTests(loader.loadTestsFromModule(module))
-
+
"""
suite.addTest(loader.loadTestsFromModule(test_server))
return suite
diff --git a/client/rhel/yum-rhn-plugin/actions/packages.py \
b/client/rhel/yum-rhn-plugin/actions/packages.py index 8a8bdb4..4e48272 100644
--- a/client/rhel/yum-rhn-plugin/actions/packages.py
+++ b/client/rhel/yum-rhn-plugin/actions/packages.py
@@ -38,7 +38,7 @@ log = up2dateLog.initLog()
YUM_PID_FILE = '/var/run/yum.pid'
-# file used to keep track of the next time rhn_check
+# file used to keep track of the next time rhn_check
# is allowed to update the package list on the server
LAST_UPDATE_FILE="/var/lib/up2date/dbtimestamp"
@@ -84,7 +84,7 @@ class YumAction(yum.YumBase):
downloadpkgs.append(po)
log.log_debug('Downloading Packages:')
- problems = self.downloadPkgs(downloadpkgs)
+ problems = self.downloadPkgs(downloadpkgs)
if len(problems.keys()) > 0:
errstring = ''
@@ -107,15 +107,15 @@ class YumAction(yum.YumBase):
# Check GPG signatures
if self.gpgsigcheck(downloadpkgs) != 0:
return 1
-
+
log.log_debug('Running Transaction Test')
tsConf = {}
for feature in ['diskspacecheck']: # more to come, I'm sure
tsConf[feature] = getattr(self.conf, feature)
-
- # clean out the ts b/c we have to give it new paths to the rpms
+
+ # clean out the ts b/c we have to give it new paths to the rpms
del self.ts
-
+
self.initActionTs()
# save our dsCallback out
testcb = callback.RPMInstallCallback(output=0)
@@ -124,17 +124,17 @@ class YumAction(yum.YumBase):
self.dsCallback = None # dumb, dumb dumb dumb!
self.populateTs(keepold=0) # sigh
tserrors = self.ts.test(testcb, conf=tsConf)
-
+
log.log_debug('Finished Transaction Test')
if len(tserrors) > 0:
errstring = 'Transaction Check Error: '
for descr in tserrors:
- errstring += ' %s\n' % descr
-
+ errstring += ' %s\n' % descr
+
raise yum.Errors.YumBaseError, errstring
log.log_debug('Transaction Test Succeeded')
del self.ts
-
+
self.initActionTs() # make a new, blank ts to populate
self.populateTs(keepold=0) # populate the ts
self.ts.check() #required for ordering
@@ -162,7 +162,7 @@ class YumAction(yum.YumBase):
if result == 0:
# Verified ok, or verify not req'd
- continue
+ continue
elif result == 1:
# bz 433781
@@ -193,14 +193,14 @@ class YumAction(yum.YumBase):
log.log_debug(
"keyurl = %s, isn't a known Red Hat key, so this " \
"will not be imported. Manually import this key " \
- "or set gpgcheck=0 in the RHN yum plugin configuration file"
+ "or set gpgcheck=0 in the RHN yum plugin configuration file"
% (keyurl))
return False
return True
def getInstalledPkgObject(self, package_tup):
installed = self.rpmdb.returnPackages()
-
+
log.log_debug("Searching for installed package to remove: %s"
% str(package_tup))
exactmatch, matched, unmatched = yum.packages.parsePackages(
@@ -216,7 +216,7 @@ class YumAction(yum.YumBase):
return ()
def add_transaction_data(self, transaction_data):
- """ Add packages to transaction.
+ """ Add packages to transaction.
transaction_data is in format:
{ 'packages' : [
[['name', '1.0.0', '1', '', ''], 'e'], ...
@@ -264,17 +264,17 @@ class YumAction(yum.YumBase):
elif action == 'e':
package_tup = _yum_package_tup(pkgtup)
packages = self.getInstalledPkgObject(package_tup)
- for package in packages:
+ for package in packages:
self.remove(package)
else:
assert False, "Unknown package transaction action."
# global module level reference to YumAction
yum_base = YumAction()
-
+
def _yum_package_tup(package_tup):
- """ Create a yum-style package tuple from an rhn package tuple.
- Allowed styles: n, n.a, n-v-r, n-e:v-r.a, n-v, n-v-r.a,
+ """ Create a yum-style package tuple from an rhn package tuple.
+ Allowed styles: n, n.a, n-v-r, n-e:v-r.a, n-v, n-v-r.a,
e:n-v-r.a
Choose from the above styles to be compatible with yum.parsePackage
"""
@@ -299,7 +299,7 @@ def remove(package_list, cache_only=None):
log.log_debug("Called remove_packages", package_list)
transaction_data = __make_transaction(package_list, 'e')
-
+
return _runTransaction(transaction_data)
def update(package_list, cache_only=None):
@@ -308,7 +308,7 @@ def update(package_list, cache_only=None):
return (13, "Invalid arguments passed to function", {})
log.log_debug("Called update", package_list)
-
+
# Remove already installed packages from the list
for package in package_list[:]:
pkgkeys = {
@@ -365,7 +365,7 @@ def update(package_list, cache_only=None):
return (0, "Requested packages already installed", {})
transaction_data = __make_transaction(package_list, 'i')
-
+
return _runTransaction(transaction_data, cache_only)
def __make_transaction(package_list, action):
@@ -401,10 +401,10 @@ def _runTransaction(transaction_data, cache_only=None):
return _run_yum_action(command, cache_only)
def runTransaction(transaction_data, cache_only=None):
- """ Run a transaction on a group of packages.
+ """ Run a transaction on a group of packages.
This was historicaly meant as generic call, but
- is only called for rollback.
- Therefore we change all actions "i" (install) to
+ is only called for rollback.
+ Therefore we change all actions "i" (install) to
"r" (rollback) where we will not check dependencies and obsoletes.
"""
if cache_only:
@@ -485,7 +485,7 @@ def _run_yum_action(command, cache_only=None):
# Fatal Error
for msg in resultmsgs:
log.log_debug('Error: %s' % msg)
- raise yum.Errors.DepError, resultmsgs
+ raise yum.Errors.DepError, resultmsgs
elif result == 0 or result == 2:
# Continue on
pass
@@ -494,11 +494,11 @@ def _run_yum_action(command, cache_only=None):
for msg in resultmsgs:
log.log_debug('Error: %s' % msg)
raise yum.Errors.YumBaseError, resultmsgs
-
+
log.log_debug("Dependencies Resolved")
yum_base.cache_onlyÊche_only
yum_base.doTransaction()
-
+
finally:
yum_base.closeRpmDB()
yum_base.doUnlock(YUM_PID_FILE)
@@ -507,7 +507,7 @@ def _run_yum_action(command, cache_only=None):
data = {}
data['version'] = "1"
data['name'] = "package_install_failure"
-
+
return (32, "Failed: Packages failed to install "\
"properly: %s" % str(e), data)
except yum.Errors.RemoveError, e:
@@ -527,7 +527,7 @@ def _run_yum_action(command, cache_only=None):
message = "Error while executing packages action: %s" % str(e)
data = {}
return (status, message, data)
-
+
return (0, "Update Succeeded", {})
@@ -561,7 +561,7 @@ def checkNeedUpdate(rhnsd=None, cache_only=None):
if last >= (dbtime - 10):
return (0, "rpm database not modified since last update (or package "
"list recently updated)", data)
-
+
if last == 0:
try:
file = open(LAST_UPDATE_FILE, "w+")
@@ -572,7 +572,7 @@ def checkNeedUpdate(rhnsd=None, cache_only=None):
# call the refresh_list action with a argument so we know it's
# from rhnsd
return refresh_list(rhnsd=1)
-
+
def refresh_list(rhnsd=None, cache_only=None):
""" push again the list of rpm packages to the server """
if cache_only:
@@ -590,7 +590,7 @@ def refresh_list(rhnsd=None, cache_only=None):
touch_time_stamp()
return (0, "rpmlist refreshed", {})
-
+
def touch_time_stamp():
try:
file_d = open(LAST_UPDATE_FILE, "w+")
@@ -615,9 +615,9 @@ def verify(packages, cache_only=None):
data['name'] = "packages.verify"
data['version'] = 0
ret, missing_packages = rpmUtils.verifyPackages(packages)
-
+
data['verify_info'] = ret
-
+
if len(missing_packages):
data['name'] = "packages.verify.missing_packages"
data['version'] = 0
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py \
b/client/rhel/yum-rhn-plugin/rhnplugin.py index 6fa95c1..05230ba 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -57,7 +57,7 @@ def init_hook(conduit):
Plugin initialization hook. We setup the Spacewlk channels here.
We get a list of Spacewalk channels from the server, then make a repo object for
- each one. This list of repos is then added to yum's list of repos via the
+ each one. This list of repos is then added to yum's list of repos via the
conduit.
"""
@@ -87,7 +87,7 @@ def init_hook(conduit):
rhn_enabled = False
PROXY_ERROR = _("There was an error parsing the Red Hat Satellite Proxy \
settings.") conduit.error(0, PROXY_ERROR + "\n" + RHN_DISABLED)
- return
+ return
# check commands and options which don't need network communication
prog_name = os.path.basename(sys.argv[0])
@@ -138,7 +138,7 @@ def init_hook(conduit):
try:
svrChannels = rhnChannel.getChannelDetails(timeout=timeout)
except up2dateErrors.NoChannelsError:
- conduit.error(0, _("This system is not subscribed to any channels.") +
+ conduit.error(0, _("This system is not subscribed to any channels.") +
"\n" + CHANNELS_DISABLED)
truncateRHNReposCache(conduit)
return
@@ -151,7 +151,7 @@ def init_hook(conduit):
except up2dateErrors.RhnServerException, e:
if hasattr(conduit._base, 'exit_code') and 'check-update' in sys.argv:
conduit._base.exit_code = 1
- conduit.error(0, COMMUNICATION_ERROR + "\n" + CHANNELS_DISABLED +
+ conduit.error(0, COMMUNICATION_ERROR + "\n" + CHANNELS_DISABLED +
"\n" + unicode(e))
return
@@ -281,7 +281,7 @@ def posttrans_hook(conduit):
rhnPackageInfo.updatePackageProfile(timeout=timeout)
except up2dateErrors.RhnServerException, e:
conduit.error(0, COMMUNICATION_ERROR + "\n" +
- _("Package profile information could not be sent.") + "\n" +
+ _("Package profile information could not be sent.") + "\n" +
unicode(e))
def rewordError(e):
@@ -301,8 +301,8 @@ def rewordError(e):
#preceeding the Error Class Code
indexB = e.errmsg.rfind("\n", 0, index)
e.errmsg = "\n" + replacedText + e.errmsg[indexB:]
-
-
+
+
class RhnRepo(YumRepository):
@@ -317,7 +317,7 @@ class RhnRepo(YumRepository):
'X-RHN-Auth',
'X-RHN-Auth-Server-Time',
'X-RHN-Auth-Expire-Offset']
-
+
def __init__(self, channel):
YumRepository.__init__(self, channel['label'])
self.name = channel['name']
@@ -332,7 +332,7 @@ class RhnRepo(YumRepository):
else: # type will be always list since Spacewalk 1.4, in future this will be \
dead coed urls.append(channel['url'] + '/GET-REQ/' + self.id)
- self.baseurl = urls
+ self.baseurl = urls
self.urls = self.baseurl
self.failovermethod = 'priority'
self.keepalive = 0
@@ -347,7 +347,7 @@ class RhnRepo(YumRepository):
self.gpgkey = []
self.gpgcheck = False
self.up2date_cfg = config.initUp2dateConfig()
-
+
try:
self.gpgkey = get_gpg_key_urls(channel['gpg_key_url'])
except InvalidGpgKeyLocation:
@@ -358,7 +358,7 @@ class RhnRepo(YumRepository):
def setupRhnHttpHeaders(self):
""" Set up self.http_headers with needed RHN X-RHN-blah headers """
-
+
try:
li = up2dateAuth.getLoginInfo(timeout=self.timeout)
except up2dateErrors.RhnServerException, e:
@@ -374,7 +374,7 @@ class RhnRepo(YumRepository):
error = _("Missing required login information for RHN: %s") \
% header
raise yum.Errors.RepoError(error)
-
+
self.http_headers[header] = li[header]
if not self.up2date_cfg['useNoSSLForPackages']:
self.http_headers['X-RHN-Transport-Capability'] = "follow-redirects=3"
@@ -494,7 +494,7 @@ class RhnRepo(YumRepository):
except URLGrabError, e:
urlException = e
continue
-
+
if result == None:
raise urlException
return result
@@ -667,7 +667,7 @@ def get_proxy_url(up2date_cfg):
proxy_url = proxy_url + ':'
proxy_url = proxy_url + urllib.quote(up2date_cfg['proxyPassword'])
proxy_url = proxy_url + '@'
-
+
netloc = config.getProxySetting()
if netloc == '':
raise BadProxyConfig
@@ -681,7 +681,7 @@ def is_valid_gpg_key_url(key_url):
proto_split = key_url.split('://')
if len(proto_split) != 2:
return False
-
+
proto, path = proto_split
if proto.lower() != 'file':
return False
diff --git a/client/rhel/yum-rhn-plugin/test/gpgkeyurltests.py \
b/client/rhel/yum-rhn-plugin/test/gpgkeyurltests.py index 7b371b7..907e3c7 100644
--- a/client/rhel/yum-rhn-plugin/test/gpgkeyurltests.py
+++ b/client/rhel/yum-rhn-plugin/test/gpgkeyurltests.py
@@ -35,7 +35,7 @@ class IsValidGpgKeyUrlTests(unittest.TestCase):
class GetGpgKeyUrlsTests(unittest.TestCase):
-
+
def test_empty_string(self):
key_urls = ""
url_list = rhnplugin.get_gpg_key_urls(key_urls)
@@ -80,6 +80,6 @@ def suite():
suite.addTest(unittest.makeSuite(IsValidGpgKeyUrlTests))
suite.addTest(unittest.makeSuite(GetGpgKeyUrlsTests))
return suite
-
+
if __name__ == "__main__":
unittest.main(defaultTest="suite")
diff --git a/client/rhel/yum-rhn-plugin/test/profilesynctests.py \
b/client/rhel/yum-rhn-plugin/test/profilesynctests.py index fee6abb..4a95b07 100644
--- a/client/rhel/yum-rhn-plugin/test/profilesynctests.py
+++ b/client/rhel/yum-rhn-plugin/test/profilesynctests.py
@@ -23,7 +23,7 @@ class SimplePkgDict:
A Simple package dictionary object.
This is essentially another way to get up2date info into yum.
"""
-
+
def __init__(self, nevra):
self.nevra = nevra
@@ -31,7 +31,7 @@ class SimplePkgDict:
class DummyPackageObject(YumAvailablePackage):
""" A yum package object for objects stored in RHN. """
-
+
def __init__(self, pkg, storageDir, repo):
name = pkg[0]
@@ -45,23 +45,23 @@ class DummyPackageObject(YumAvailablePackage):
# YUM prefers the epoch to be '0', not ''.
if epoch == '':
epoch = '0'
-
+
nevra = (name, epoch, version, release, arch)
pkgdict = SimplePkgDict(nevra)
-
+
YumAvailablePackage.__init__(self, repo, pkgdict)
self.pkg = pkg
self.simple['repoid'] = channel
self.simple['id'] = name
self.simple['packagesize'] = size
-
+
# Not including epoch here because up2date doesn't.
hdrname = "%s-%s-%s.%s.hdr" % (name, version, release, arch)
rpmname = "%s-%s-%s.%s.rpm" % (name, version, release, arch)
self.simple['relativepath'] = rpmname
-
+
self.hdrpath = "%s/%s" % (storageDir, hdrname)
self.localpath = "%s/%s" % (storageDir, rpmname)
@@ -70,7 +70,7 @@ class DummyPackageObject(YumAvailablePackage):
def returnSimple(self, name):
"""
Return one of the package's simple attributes. If we don't know about it,
- return None instead.
+ return None instead.
"""
try:
return YumAvailablePackage.returnSimple(self, name)
@@ -96,7 +96,7 @@ class ProfileSyncTests(unittest.TestCase):
"rhel-4")
self.old_package = DummyPackageObject(self.old_pkg_tup,
"/Fake/Location", repo)
-
+
self.ts_info = transactioninfo.TransactionData()
@@ -133,7 +133,7 @@ class ProfileSyncTests(unittest.TestCase):
def testUpdatedProfileSync(self):
self.ts_info.addUpdate(self.package, self.old_package)
-
+
delta = rhnplugin.make_package_delta(self.ts_info)
self.assertEquals(0, len(delta["removed"]))
@@ -150,7 +150,7 @@ class ProfileSyncTests(unittest.TestCase):
self.assertEquals(1, len(delta["added"]))
self.assertEquals(self.pkg_tup[:5], delta["added"][0])
-
+
def testObsoletedProfileSync(self):
self.ts_info.addObsoleted(self.old_package, self.package)
@@ -164,6 +164,6 @@ def suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(ProfileSyncTests))
return suite
-
+
if __name__ == "__main__":
unittest.main(defaultTest="suite")
diff --git a/client/rhel/yum-rhn-plugin/test/proxyconfigtests.py \
b/client/rhel/yum-rhn-plugin/test/proxyconfigtests.py index 6cd7497..9b640a5 100644
--- a/client/rhel/yum-rhn-plugin/test/proxyconfigtests.py
+++ b/client/rhel/yum-rhn-plugin/test/proxyconfigtests.py
@@ -11,7 +11,7 @@ import rhnplugin
class ProxyConfigTests(unittest.TestCase):
-
+
def testProxyDisabled(self):
up2date_cfg = {}
up2date_cfg['enableProxy'] = False
@@ -147,6 +147,6 @@ def suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(ProxyConfigTests))
return suite
-
+
if __name__ == "__main__":
unittest.main(defaultTest="suite")
diff --git a/client/rhel/yum-rhn-plugin/test/sslcacertconfigtests.py \
b/client/rhel/yum-rhn-plugin/test/sslcacertconfigtests.py index c7ab424..af36487 \
100644
--- a/client/rhel/yum-rhn-plugin/test/sslcacertconfigtests.py
+++ b/client/rhel/yum-rhn-plugin/test/sslcacertconfigtests.py
@@ -11,23 +11,23 @@ import rhnplugin
class SslCaCertConfigTests(unittest.TestCase):
-
+
def test_ssl_ca_cert_empty(self):
up2date_cfg = {}
up2date_cfg['sslCACert'] = ''
-
+
self.assertRaises(rhnplugin.BadSslCaCertConfig,
rhnplugin.get_ssl_ca_cert, up2date_cfg)
def test_no_ssl_ca_cert(self):
up2date_cfg = {}
-
+
self.assertRaises(rhnplugin.BadSslCaCertConfig,
rhnplugin.get_ssl_ca_cert, up2date_cfg)
def test_single_ssl_ca_cert(self):
up2date_cfg = {}
-
+
expected = '/var/foo/bar'
up2date_cfg['sslCACert'] = expected
@@ -60,7 +60,7 @@ class SslCaCertConfigTests(unittest.TestCase):
def test_ssl_ca_cert_empty_list(self):
up2date_cfg = {}
up2date_cfg['sslCACert'] = []
-
+
self.assertRaises(rhnplugin.BadSslCaCertConfig,
rhnplugin.get_ssl_ca_cert, up2date_cfg)
@@ -69,6 +69,6 @@ def suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(SslCaCertConfigTests))
return suite
-
+
if __name__ == "__main__":
unittest.main(defaultTest="suite")
diff --git a/client/solaris/rhnclient/rhn/actions/__init__.py \
b/client/solaris/rhnclient/rhn/actions/__init__.py index 1ffd83e..96ac67e 100755
--- a/client/solaris/rhnclient/rhn/actions/__init__.py
+++ b/client/solaris/rhnclient/rhn/actions/__init__.py
@@ -1,5 +1,5 @@
"""Export allowable xmlrpc actions and do_call method"""
-
+
# RHN Action exporter
# Copyright (c) 1999-2005 Red Hat, Inc. Distributed under GPL.
# $Id$
@@ -9,7 +9,7 @@ def do_call(method, params):
<method> format is "ACTION_FILE.METHOD_NAME"."""
parts = method.split(".")
- if len(parts) != 2:
+ if len(parts) != 2:
raise AttributeError("Invalid action syntax: '%s'" % method)
try:
func = getattr(globals()[parts[0]], parts[1])
@@ -27,7 +27,7 @@ class Action:
def setup():
import os, sys
-
+
actions_dir = os.path.dirname(sys.modules[__name__].__file__) or '.'
if actions_dir not in sys.path:
sys.path.append(actions_dir)
diff --git a/client/solaris/rhnclient/rhn/actions/rhnsd.py \
b/client/solaris/rhnclient/rhn/actions/rhnsd.py index e616a0e..fcdcd6a 100755
--- a/client/solaris/rhnclient/rhn/actions/rhnsd.py
+++ b/client/solaris/rhnclient/rhn/actions/rhnsd.py
@@ -30,7 +30,7 @@ def __configRhnsd(interval):
if comps[0] == "INTERVAL":
index = count
count = count + 1
-
+
if index != None:
tmplines[index] = "INTERVAL=%s" % interval
diff --git a/client/solaris/rhnclient/rhn/actions/systemid.py \
b/client/solaris/rhnclient/rhn/actions/systemid.py index 498f451..0ae6b45 100755
--- a/client/solaris/rhnclient/rhn/actions/systemid.py
+++ b/client/solaris/rhnclient/rhn/actions/systemid.py
@@ -26,7 +26,7 @@ def disable(messageText):
fd.write("Disable lock created on %s. RHN Server Message:\n\n%s\n" % (
time.ctime(time.time()), messageText))
fd.close()
-
+
# done if we survived this long
return(0, "systemId disable lock file has been writen", {})
diff --git a/client/solaris/rhnclient/rhn/actions/up2date_config.py \
b/client/solaris/rhnclient/rhn/actions/up2date_config.py index 2be003c..7d69241 \
100755
--- a/client/solaris/rhnclient/rhn/actions/up2date_config.py
+++ b/client/solaris/rhnclient/rhn/actions/up2date_config.py
@@ -72,7 +72,7 @@ def main():
print configdata
# print
import pprint
-
+
pprint.pprint(update(configdata))
configdata['serverURL'] = "http://hokeypokeyland.org/XMLRPC"
diff --git a/client/solaris/rhnclient/rhn/client/capabilities.py \
b/client/solaris/rhnclient/rhn/client/capabilities.py index 01064cd..fae3b68 100755
--- a/client/solaris/rhnclient/rhn/client/capabilities.py
+++ b/client/solaris/rhnclient/rhn/client/capabilities.py
@@ -30,11 +30,11 @@ def parseCap(capstring):
except ValueError:
# Bad directive: not in 'a = b' format
continue
-
+
# parse out the version
# lets give it a shot sans regex's first...
(key,version) = string.split(key_version, "(", 1)
-
+
# just to be paranoid
if version[-1] != ")":
print "something broke in parsing the capabilited headers"
@@ -141,7 +141,7 @@ class Capabilities(UserDict.UserDict):
#print "self.cfg['supportsExtendedPackageProfile']: %s" % \
self.cfg['supportsExtendedPackageProfile'] #print tmpCaps
-
+
# if we want to blow up on missing caps we cant eat around
missingCaps = []
wrongVersionCaps = []
diff --git a/client/solaris/rhnclient/rhn/client/clientCaps.py \
b/client/solaris/rhnclient/rhn/client/clientCaps.py index ee2a5b4..f328639 100755
--- a/client/solaris/rhnclient/rhn/client/clientCaps.py
+++ b/client/solaris/rhnclient/rhn/client/clientCaps.py
@@ -63,13 +63,13 @@ def loadLocalCaps():
caps.data[cap] = data
# print caps.data
-
+
loadLocalCaps()
# register local caps we require.
def registerCap(cap, data):
caps.data[cap] = data
-
+
# figure out something pretty here
registerCap("packages.runTransaction", {'version':'1', 'value':'1'})
diff --git a/client/solaris/rhnclient/rhn/client/config.py \
b/client/solaris/rhnclient/rhn/client/config.py index b8dfb2f..17a745d 100755
--- a/client/solaris/rhnclient/rhn/client/config.py
+++ b/client/solaris/rhnclient/rhn/client/config.py
@@ -80,7 +80,7 @@ Defaults = {
'headerCacheSize' : ("The maximum number of rpm headers to cache in ram",
40),
'headerFetchCount' : ("The maximimum number of rpm headers to "\
- "fetch at once",
+ "fetch at once",
10),
'forceInstall' : ("Force package installation, ignoring package, "\
"file and config file skip list",
@@ -124,7 +124,7 @@ class ConfigFile:
self.fileName = filename
if self.fileName:
self.load()
-
+
def load(self, filename = None):
if filename:
self.fileName = filename
@@ -133,14 +133,14 @@ class ConfigFile:
if not os.access(self.fileName, os.R_OK):
print "warning: can't access %s" % self.fileName
return
-
+
f = open(self.fileName, "r")
for line in f.readlines():
# strip comments
if '#' in line:
line = line[:string.find(line, '#')]
- line = string.strip(line)
+ line = string.strip(line)
if not line:
continue
@@ -187,7 +187,7 @@ class ConfigFile:
def save(self):
if self.fileName == None:
return
-
+
f = open(self.fileName, "w")
os.chmod(self.fileName, 0600)
@@ -219,7 +219,7 @@ class ConfigFile:
def __getitem__(self, name):
if self.dict.has_key(name):
return self.dict[name][1]
- return None
+ return None
def __setitem__(self, name, value):
if self.dict.has_key(name):
val = self.dict[name]
@@ -277,11 +277,11 @@ class Config:
if self.stored.has_key(name):
return self.stored[name]
return None
-
+
# These function expose access to the peristent storage for
# updates and saves
def info(self, name): # retrieve comments
- return self.stored.info(name)
+ return self.stored.info(name)
def save(self):
self.stored.save()
def load(self, filename):
@@ -303,7 +303,7 @@ class UuidConfig(ConfigFile):
"derived from the ConfigFile class, with prepopulated default values"
def __init__(self):
ConfigFile.__init__(self)
- self.fileName = UP2DATE_UUID
+ self.fileName = UP2DATE_UUID
def initUp2dateConfig(file = UP2DATE_CONFIG):
@@ -312,11 +312,11 @@ def initUp2dateConfig(file = UP2DATE_CONFIG):
cfg = cfg
except NameError:
cfg = None
-
+
if cfg == None:
cfg = Config(file)
- cfg["isatty"] = 0
+ cfg["isatty"] = 0
if sys.stdout.isatty():
cfg["isatty"] = 1
# pull this into the main cfg dict from the
diff --git a/client/solaris/rhnclient/rhn/client/hardware.py \
b/client/solaris/rhnclient/rhn/client/hardware.py index 975662d..534d534 100755
--- a/client/solaris/rhnclient/rhn/client/hardware.py
+++ b/client/solaris/rhnclient/rhn/client/hardware.py
@@ -49,11 +49,11 @@ def read_hwconf():
ret = []
return ret
-
+
# the cpuinfo is dict with keys on class, desc, platform,
# count, type, model, model_number, model_ver, model_rev,
-# cache, bogomips, other, and speed
+# cache, bogomips, other, and speed
#
# of course, the meanings for those vary widely, even on
# linux, so best guess for the port
@@ -267,7 +267,7 @@ def read_cpuinfo():
pass
elif (re.search(r'F50|H50|270', model)):
# On these boxes, "lscfg -vp" reports CPU speed as
- # ASCII coded hex.
+ # ASCII coded hex.
stdout = os.popen("/usr/sbin/lscfg -vp")
lines = stdout.readlines()
stdout.close()
@@ -319,7 +319,7 @@ def read_cpuinfo():
count = count + 1
if not count: count = 1
-
+
hwdict = {'class':'CPU',
'desc': 'processor',
@@ -333,7 +333,7 @@ def read_cpuinfo():
'speed': str(mhz)}
return hwdict
-
+
# figure out how much ram is in the box
def read_memory():
@@ -436,7 +436,7 @@ def findHostByRoute():
def read_network():
netdict = {}
netdict['class'] = "NETINFO"
-
+
hostname = socket.gethostname()
netdict['hostname'] = hostname
try:
@@ -444,7 +444,7 @@ def read_network():
except:
netdict['ipaddr'] = "127.0.0.1"
-
+
if netdict['hostname'] == 'localhost.localdomain' or \
netdict['ipaddr'] == "127.0.0.1":
hostname, ipaddr = findHostByRoute()
@@ -471,8 +471,8 @@ def read_network_interfaces():
'module': module}
return intDict
-
-
+
+
# this one reads it all
def Hardware():
allhw = []
@@ -497,7 +497,7 @@ def Hardware():
# ret = read_network_interfaces()
# if ret:
# allhw.append(ret)
-
+
# all Done.
return allhw
diff --git a/client/solaris/rhnclient/rhn/client/rhnAuth.py \
b/client/solaris/rhnclient/rhn/client/rhnAuth.py index a024165..1094118 100755
--- a/client/solaris/rhnclient/rhn/client/rhnAuth.py
+++ b/client/solaris/rhnclient/rhn/client/rhnAuth.py
@@ -25,10 +25,10 @@ def getSystemId():
path = cfg["systemIdPath"]
if not os.access(path, os.R_OK):
return None
-
+
f = open(path, "r")
ret = f.read()
-
+
f.close()
return ret
@@ -44,10 +44,10 @@ def maybeUpdateVersion():
return 0
systemVer = rhnUtils.getVersion()
-
+
if idVer != systemVer:
s = rpcServer.getServer()
-
+
try:
newSystemId = rpcServer.doCall(s.registration.upgrade_version,
getSystemId(), systemVer)
@@ -98,7 +98,7 @@ def login(systemId=None):
if not systemId:
return None
-
+
maybeUpdateVersion()
log.log_me("logging into up2date server")
@@ -125,8 +125,8 @@ def login(systemId=None):
# for i in response_headers.keys():
# print "key: %s foo: %s" % (i, response_headers[i])
-
-
+
+
log.log_me("successfully retrieved authentication token "
"from up2date server")
diff --git a/client/solaris/rhnclient/rhn/client/rhnErrors.py \
b/client/solaris/rhnclient/rhn/client/rhnErrors.py index ede5f09..df64ac5 100755
--- a/client/solaris/rhnclient/rhn/client/rhnErrors.py
+++ b/client/solaris/rhnclient/rhn/client/rhnErrors.py
@@ -21,7 +21,7 @@ class Error:
def __repr__(self):
self.log.log_me(self.errmsg)
return self.errmsg
-
+
class FileError(Error):
"""
error to report when we encounter file errors (missing files/dirs,
@@ -51,7 +51,7 @@ class RpmInstallError(Error):
log = rhnLog.initLog()
log.log_me(msg)
return msg
-
+
class PasswordError(Error):
"""Raise when the server responds with that a password is incorrect"""
@@ -84,7 +84,7 @@ class FileConflictError(Error):
log = rhnLog.initLog()
log.log_me(msg)
return msg
-
+
class DependencyError(Error):
"""Raise when a rpm transaction set has a dependency error"""
def __init__(self, msg, deps=None):
@@ -92,7 +92,7 @@ class DependencyError(Error):
# just tag on the whole deps tuple, so we have plenty of info
# to play with
self.deps = deps
-
+
def __repr__(self):
msg = _("RPM dependency error. The message was:\n") + self.errmsg
log = rhnLog.initLog()
@@ -106,7 +106,7 @@ class TransactionError(Error):
# just tag on the whole deps tuple, so we have plenty of info
# to play with
self.deps = deps
-
+
def __repr__(self):
msg = _("RPM error. The message was:\n") + self.errmsg
log = rhnLog.initLog()
@@ -119,7 +119,7 @@ class UnsolvedDependencyError(Error):
def __init__(self, msg, dep=None, pkgs=None):
self.errmsg = msg
self.dep = dep
- self.pkgs = pkgs
+ self.pkgs = pkgs
def __repr__(self):
msg = _("RPM dependency error. The message was:\n") + self.errmsg
log = rhnLog.initLog()
@@ -143,7 +143,7 @@ class SkipListError(Error):
"""Raise when all the packages you want updated are on a skip list"""
def __init__(self, msg, pkglist=None):
self.errmsg = msg
- self.pkglist = pkglist
+ self.pkglist = pkglist
def __repr__(self):
msg = _("Package Skip List error. The message was:\n") + self.errmsg
log = rhnLog.initLog()
@@ -305,7 +305,7 @@ class ServerThrottleError(Error):
def __repr__(self):
return self.errmsg
-
+
class AbuseError(Error):
def __init__(self, msg):
self.errmsg = msg
@@ -323,7 +323,7 @@ class AuthenticationTicketError(Error):
class AuthenticationError(Error):
def __init__(self, msg):
self.errmsg = msg
-
+
def __repr__(self):
return self.errmsg
@@ -334,7 +334,7 @@ class ValidationError(Error):
# indicates an error during server input validation
def __repr__(self):
return _("Error validating data at server:\n") + self.errmsg
-
+
class OemInfoFileError(Error):
def __init__(self,errmsg):
Error.__init__(self, errmsg)
diff --git a/client/solaris/rhnclient/rhn/client/rhnHardware.py \
b/client/solaris/rhnclient/rhn/client/rhnHardware.py index aa163d8..43e8533 100755
--- a/client/solaris/rhnclient/rhn/client/rhnHardware.py
+++ b/client/solaris/rhnclient/rhn/client/rhnHardware.py
@@ -28,6 +28,6 @@ def updateHardware():
#print _("Updating package profile...")
s = rpcServer.getServer()
-
+
hardwareList = hardware.Hardware()
s.registration.refresh_hw_profile(registered, hardwareList)
diff --git a/client/solaris/rhnclient/rhn/client/rhnLog.py \
b/client/solaris/rhnclient/rhn/client/rhnLog.py index d63351c..9b2c56e 100755
--- a/client/solaris/rhnclient/rhn/client/rhnLog.py
+++ b/client/solaris/rhnclient/rhn/client/rhnLog.py
@@ -13,14 +13,14 @@ class Log:
def __init__(self):
self.app = "rhn client"
self.cfg = config.initUp2dateConfig()
-
+
def log_debug(self, *args):
if self.cfg["debug"] > 1:
apply(self.log_me, args, {})
if self.cfg["isatty"]:
print "D:", string.join(map(lambda a: str(a), args), " ")
-
+
def log_me(self, *args):
self.log_info = "[%s] %s" % (time.ctime(time.time()), self.app)
s = ""
@@ -36,7 +36,7 @@ class Log:
self.write_log(bar)
def write_log(self, s):
-
+
log_name = self.cfg["logFile"] or "%s//var/log/up2date" % config.PREFIX
log_file = open(log_name, 'a')
msg = "%s %s\n" % (self.log_info, str(s))
diff --git a/client/solaris/rhnclient/rhn/client/rhnPackages.py \
b/client/solaris/rhnclient/rhn/client/rhnPackages.py index 48ddbc6..dc0022d 100755
--- a/client/solaris/rhnclient/rhn/client/rhnPackages.py
+++ b/client/solaris/rhnclient/rhn/client/rhnPackages.py
@@ -101,7 +101,7 @@ def _readFD(fd, filename):
def downloadPackage(channel, pkghash, localfile, serverUrl=None):
cfg = config.initUp2dateConfig()
-
+
serverSettings = ServerSettings()
if serverUrl is not None:
serverSettings.httpServerUrl = serverUrl
@@ -110,7 +110,7 @@ def downloadPackage(channel, pkghash, localfile, serverUrl=None):
fd = rpcServer.doCall(s.getPackage, channel, pkghash)
status = s.get_response_status()
-
+
f2 = _readFD(fd, localfile)
f2.close()
fd.close()
diff --git a/client/solaris/rhnclient/rhn/client/rhnReg.py \
b/client/solaris/rhnclient/rhn/client/rhnReg.py index 9941270..f7724c4 100755
--- a/client/solaris/rhnclient/rhn/client/rhnReg.py
+++ b/client/solaris/rhnclient/rhn/client/rhnReg.py
@@ -70,7 +70,7 @@ def startRhnsd():
rc = os.system("/etc/init.d/rhnsd status > /dev/null")
if rc:
os.system("/etc/init.d/rhnsd start > /dev/null")
-
+
# product info structure
productInfoHash = {
@@ -90,7 +90,7 @@ productInfoHash = {
"contact_email" : 1,
"contact_mail" : 0,
"contact_phone" : 0,
- "contact_fax" : 0,
+ "contact_fax" : 0,
"newsletter" : 0,
"special_offers" : 0
}
@@ -114,13 +114,13 @@ def getOemInfo():
(key, value) = string.split(i, ':')
except ValueError:
raise rhnErrors.OemInfoFileError(i)
-
+
info[key] = string.strip(value)
return info
-
-
+
+
def registered():
global SYSID_FILE
return os.access(SYSID_FILE, os.R_OK)
@@ -128,7 +128,7 @@ def registered():
def writeSystemId(systemId):
global SYSID_FILE
global SYSID_DIR
-
+
if not os.access(SYSID_DIR, os.W_OK):
try:
os.mkdir(SYSID_DIR)
@@ -165,7 +165,7 @@ def welcomeText():
raise rhnErrors.DelayError(f.faultString)
else:
raise rhnErrors.CommunicationError(f.faultString)
-
+
def privacyText():
s = rpcServer.getServer()
@@ -196,7 +196,7 @@ def finishMessage(systemId):
def getCaps():
s = rpcServer.getServer()
-
+
try:
rpcServer.doCall(s.registration.welcome_message)
except xmlrpclib.Fault, f:
@@ -211,7 +211,7 @@ def getCaps():
# figure out if were missing any needed caps
caps.validate()
-
+
def termsAndConditions():
s = rpcServer.getServer()
@@ -225,7 +225,7 @@ def termsAndConditions():
def reserveUser(username, password):
s = rpcServer.getServer()
-
+
try:
ret = rpcServer.doCall(s.registration.reserve_user, username, password)
except xmlrpclib.Fault, f:
@@ -305,7 +305,7 @@ def registerSystem(username = None, password = None,
auth_dict["uuid"] = cfg["uuid"] or ""
auth_dict["rhnuuid"] = cfg["rhnuuid"] or ""
-
+
try:
if packages == None:
diff --git a/client/solaris/rhnclient/rhn/client/rhnUtils.py \
b/client/solaris/rhnclient/rhn/client/rhnUtils.py index fc37c79..36ff6f3 100755
--- a/client/solaris/rhnclient/rhn/client/rhnUtils.py
+++ b/client/solaris/rhnclient/rhn/client/rhnUtils.py
@@ -34,7 +34,7 @@ import config
from translate import _
-# file used to keep track of the next time rhn_check
+# file used to keep track of the next time rhn_check
# is allowed to update the package list on the server
LAST_UPDATE_FILE = os.path.normpath("%s/var/lib/rhn/dbtimestamp" % config.PREFIX)
@@ -79,12 +79,12 @@ def restartUp2date():
# if exit:
# sys.exit()
# os.wait()
-
-
+
+
def md5sum(fileName):
hash = md5.new()
-
+
try:
f = open(fileName, "r")
except:
@@ -94,7 +94,7 @@ def md5sum(fileName):
hash.update(fData)
del fData
f.close()
-
+
hex = string.hexdigits
md5res = ""
for c in hash.digest():
@@ -167,13 +167,13 @@ def findArch():
out = outfd.read()
unameparts = string.split(out)
arch = unameparts[5]
-
+
# ugh, I really dont want to implement config.guess...
if osname == "SunOS":
osname = "solaris"
return "%s-%s-%s" % (arch, platform, osname)
-
+
def getArch():
platformpath = os.path.normpath("%s/etc/rhn/platform" % config.PREFIX)
if not os.access(platformpath, os.R_OK):
@@ -221,7 +221,7 @@ def my_popen(cmd):
c = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, close_fds=True, bufsize=0)
- # We don't write to the child process
+ # We don't write to the child process
c.stdin.close()
child_out = tempfile.TemporaryFile()
@@ -254,7 +254,7 @@ def my_popen(cmd):
for childfd, tempfd in fd_mappings:
if childfd in readfds:
data = os.read(childfd.fileno(), buffer_size)
-
+
if data:
tempfd.write(data)
@@ -281,7 +281,7 @@ def freeDiskSpace():
#dbpath = "/var/lib/rpm"
#if cfg['dbpath']:
# dbpath = cfg['dbpath']
-#RPM_PACKAGE_FILE="%s/Packages" % dbpath
+#RPM_PACKAGE_FILE="%s/Packages" % dbpath
def touchTimeStamp():
try:
diff --git a/client/solaris/rhnclient/rhn/client/rpcServer.py \
b/client/solaris/rhnclient/rhn/client/rpcServer.py index 2249dae..42a98b3 100755
--- a/client/solaris/rhnclient/rhn/client/rpcServer.py
+++ b/client/solaris/rhnclient/rhn/client/rpcServer.py
@@ -6,8 +6,8 @@ import sys
import config
import clientCaps
import rhnLog
-import rhnErrors
-import rhnAuth
+import rhnErrors
+import rhnAuth
import rhnUtils
#import wrapperUtils
@@ -24,9 +24,9 @@ try:
from rhn import rpclib
except ImportError:
rpclib = __import__("xmlrpclib")
-
+
from translate import _
-
+
def stdoutMsgCallback(msg):
print msg
@@ -72,13 +72,13 @@ def getServer(refreshCallback=None):
lang = string.split(lang, '.')[0]
break
-
+
s = rpclib.Server(serverUrl, refreshCallback=refreshCallback,
proxy=proxyHost,
username=proxyUser,
password=proxyPassword)
s.add_header("X-Up2date-Version", rhnUtils.version())
-
+
if lang:
s.setlang(lang)
@@ -112,7 +112,7 @@ def doCall(method, *args, **kwargs):
while 1:
failure = 0
- ret = None
+ ret = None
try:
ret = apply(method, args, kwargs)
except KeyboardInterrupt:
@@ -130,7 +130,7 @@ def doCall(method, *args, **kwargs):
else:
failure = 1
except httplib.IncompleteRead:
- print "httplib.IncompleteRead"
+ print "httplib.IncompleteRead"
raise rhnErrors.CommunicationError("httplib.IncompleteRead")
except urllib2.HTTPError, e:
@@ -140,9 +140,9 @@ def doCall(method, *args, **kwargs):
msg = msg + "Error Message: %s\n" % e.msg
log.log_me(msg)
raise rhnErrors.CommunicationError(msg)
-
+
except xmlrpclib.ProtocolError, e:
-
+
log.log_me("A protocol error occurred: %s , attempt #%s," % (
e.errmsg, attempt_count))
(errCode, errMsg) = rpclib.reportError(e.headers)
@@ -175,7 +175,7 @@ def doCall(method, *args, **kwargs):
pkg = args[0]
else:
pkg=args[1]
-
+
if type(pkg) == type([]):
pkgName = "%s-%s-%s.%s" % (pkg[0], pkg[1], pkg[2], pkg[4])
else:
@@ -183,13 +183,13 @@ def doCall(method, *args, **kwargs):
msg = "File Not Found: %s\n%s" % (pkgName, errMsg)
log.log_me(msg)
raise rhnErrors.FileNotFoundError(msg)
-
+
if not reset:
if attempt_count >= attempts:
raise rhnErrors.CommunicationError(e.errmsg)
else:
failure = 1
-
+
except xmlrpclib.ResponseError:
raise rhnErrors.CommunicationError(
"Broken response from the server.")
@@ -200,6 +200,6 @@ def doCall(method, *args, **kwargs):
attempt_count = attempt_count + 1
if ret != None:
break
-
+
return ret
-
+
diff --git a/client/solaris/rhnclient/rhn/client/translate.py \
b/client/solaris/rhnclient/rhn/client/translate.py index 92111d9..ea95b34 100755
--- a/client/solaris/rhnclient/rhn/client/translate.py
+++ b/client/solaris/rhnclient/rhn/client/translate.py
@@ -44,7 +44,7 @@ def _readEnvironment():
newlang.append(l)
lang = newlang
del newlang
-
+
if 'C' not in lang:
lang.append('C')
diff --git a/client/solaris/rhnclient/rhn_check.py \
b/client/solaris/rhnclient/rhn_check.py index 76257c7..90ba6aa 100755
--- a/client/solaris/rhnclient/rhn_check.py
+++ b/client/solaris/rhnclient/rhn_check.py
@@ -52,24 +52,24 @@ cfg = config.initUp2dateConfig()
log = rhnLog.initLog()
# action version we understand
-ACTION_VERSION = 2
+ACTION_VERSION = 2
# lock file to check if we're disabled at the server's request
DISABLE_FILE = os.path.join(config.RHN_SYSCONFIG_DIR, "disable")
# path location of the CA cert file
-rhns_ca_cert = cfg['sslCACert']
+rhns_ca_cert = cfg['sslCACert']
# Exceptions
class UnknownXML:
def __init__(self, value):
self.__value = value
-
+
def __repr__(self):
return "Invalid request received (%s)." % self.__value
-def showHelp():
+def showHelp():
print _("Usage: rhn_check [options]")
print ""
print _("Available command line options:")
@@ -88,7 +88,7 @@ def run_local_actions():
params = method_params[1]
(status, message, data) = run_action(method, params)
log.log_debug("local action status: ", (status, message, data))
-
+
# submit a response for an action_id
def submit_response(action_id, status, message, data):
global server
@@ -112,7 +112,7 @@ def submit_response(action_id, status, message, data):
except socket.error:
print "Could not submit to %s.\n"\
"Possible networking problem?" % str(server)
- sys.exit(-1)
+ sys.exit(-1)
return ret
###
@@ -120,7 +120,7 @@ def submit_response(action_id, status, message, data):
###
def check_action(action):
log.log_debug("check_action", action)
-
+
# be very paranoid of what we get back
if type(action) != type({}):
print "Got unparseable action response from server"
@@ -146,10 +146,10 @@ def check_action(action):
def run_action(method, params):
try:
log.log_debug("do_call", method, params)
- (status, message, data) = rhn.actions.do_call(method, params)
+ (status, message, data) = rhn.actions.do_call(method, params)
except (TypeError, ValueError, KeyError, IndexError):
if cfg["debug"]:
- traceback.print_exc()
+ traceback.print_exc()
# wrong number of arguments, wrong type of arguments, etc
status = 6,
message = "Fatal error in Python code occurred"
@@ -172,16 +172,16 @@ def run_action(method, params):
# Wrapper handler for the action we're asked to do
def handle_action(action):
global server
-
+
log.log_debug("handle_action", action)
-
+
version = action['version']
action_id = action['id']
data = action['action']
log.log_debug("handle_action actionid = %s, version = %s" % (
action_id, version))
-
+
# Decipher the data
parser, decoder = xmlrpclib.getparser()
parser.feed(data)
@@ -194,7 +194,7 @@ def handle_action(action):
log.log_debug("Sending back response", (status, message, data))
return submit_response(action_id, status, message, data)
-
+
###
# Init
###
@@ -219,12 +219,12 @@ for (opt, val) in opts:
elif opt in ["--help", "-h"]:
showHelp()
sys.exit(0)
-
+
# if we're disabled, go down (almost) quietly
if os.path.exists(DISABLE_FILE):
print "RHN service is disabled. Check %s" % DISABLE_FILE
sys.exit(0)
-
+
# retrieve the system_id. This is required.
if not rhnAuth.getSystemId():
print "ERROR: unable to read system id."
@@ -306,13 +306,13 @@ while 1:
response_headers = server.get_response_headers()
caps.populate(response_headers)
# do we actually want to validte here?
- try:
+ try:
caps.validate()
except rhnErrors.ServerCapabilityError, e:
print e
sys.exit(1)
-
-
+
+
if action == "" or action == {}:
break
diff --git a/client/solaris/rhnclient/rhnreg_ks.py \
b/client/solaris/rhnclient/rhnreg_ks.py index c169a84..bcf198a 100755
--- a/client/solaris/rhnclient/rhnreg_ks.py
+++ b/client/solaris/rhnclient/rhnreg_ks.py
@@ -1,11 +1,11 @@
#!/usr/bin/python
#
-# Registration client for the Spacewalk for useage with kickstart
+# Registration client for the Spacewalk for useage with kickstart
# Copyright (c) 1999--2012 Red Hat, Inc. Distributed under GPL.
#
# Author: Adrian Likins <alikins@redhat.com>
#
-# see the output of "--help" for the valid options.
+# see the output of "--help" for the valid options.
#
# The contact info is in the form or a "key: value" one per line.
# valid keys are:
@@ -49,7 +49,7 @@ def printUsage():
print _(" --noSSLServerURL=<url> - specify a url for a non ssl server")
print _(" --useNoSSLForPackages - dont use ssl to download packages")
print _(" --sslCACert=<path> - specify a file to use as the ssl CA \
cert")
- print _(" --serverUrl=<URL> - specify a url to use as a server")
+ print _(" --serverUrl=<URL> - specify a url to use as a server")
print _(" --email=<value> - specify a email address ")
print _(" --activationkey=<value> - specify an activation key ")
print _(" --contactinfo - read contact info from stdin ")
@@ -93,7 +93,7 @@ def readContactInfo():
"contact_fax",
"contact_special",
"contact_newsletter"]
-
+
# read a file from standard in or filename if specified
L = sys.stdin.readlines()
@@ -118,13 +118,13 @@ def generateProfileName(hardwareList):
if hw['class'] == 'NETINFO':
hostname = hw.get('hostname')
ipaddr = hw.get('ipaddr')
-
+
if hostname:
profileName = idn_pune_to_unicode(hostname)
else:
if ipaddr:
profileName = ipaddr
-
+
if not profileName:
print _("A profilename was not specified, "\
"and hostname and IP address could not be determined "\
@@ -143,7 +143,7 @@ def runRhnCheck():
def main(arglist=[]):
-
+
if not len(arglist):
arglist = sys.argv[1:]
try:
@@ -161,12 +161,12 @@ def main(arglist=[]):
'activationkey=',
'serialnumber=',
'serverUrl=',
- 'noSSLServerURL=',
+ 'noSSLServerURL=',
'useNoSSLForPackages',
'proxy=',
'proxyUser=',
'proxyPassword=',
- 'sslCACert=',
+ 'sslCACert=',
'contactinfo',
'email=',"force",])
except getopt.error, e:
@@ -190,7 +190,7 @@ def main(arglist=[]):
# the "rhnregks;up2date -u" case
rhnReg.cfg.set("networkSetup", 1)
rhnReg.cfg.save()
-
+
save_cfg = 0
for opt in optlist:
if opt[0] in ['-h', "--help"]:
@@ -219,7 +219,7 @@ def main(arglist=[]):
if opt[0] == "--nohardware":
nohardware = 1
if opt[0] == "--norhnsd":
- norhnsd = 1
+ norhnsd = 1
if opt[0] == "--serialnumber":
print "--serialnumber is deprecated, please use --activationkey"
serialnumber = str(opt[1])
@@ -241,7 +241,7 @@ def main(arglist=[]):
rhnReg.cfg.set("httpProxy", opt[1])
rhnReg.cfg.set("enableProxy", 1)
save_cfg = 1
- if opt[0] == "--proxyUser":
+ if opt[0] == "--proxyUser":
rhnReg.cfg.set("proxyUser", opt[1])
rhnReg.cfg.set("enableProxyAuth", 1)
save_cfg = 1
@@ -264,7 +264,7 @@ def main(arglist=[]):
if save_cfg:
rhnReg.cfg.save()
-
+
if rhnReg.registered() and not force:
print _("This system is already registered. Use --force to override")
sys.exit(-1)
@@ -275,7 +275,7 @@ def main(arglist=[]):
sys.exit(-1)
rhnReg.getCaps()
-
+
if not serialnumber:
# reserver the username
ret = rhnReg.reserveUser(username, password)
@@ -292,11 +292,11 @@ def main(arglist=[]):
# packageList = []
- # collect oemInfo
+ # collect oemInfo
oemInfo = rhnReg.getOemInfo()
-
+
hardwareList = hardware.Hardware()
-
+
if not profilename:
profilename = generateProfileName(hardwareList)
@@ -315,8 +315,8 @@ def main(arglist=[]):
except rhnErrors.CommunicationError, e:
print "%s" % e.errmsg
sys.exit(1)
-
-
+
+
if serialnumber:
rhnReg.sendSerialNumber(systemId, serialnumber)
diff --git a/client/solaris/smartpm/sandbox/cdproblems.py \
b/client/solaris/smartpm/sandbox/cdproblems.py index e79b770..8fd35f0 100644
--- a/client/solaris/smartpm/sandbox/cdproblems.py
+++ b/client/solaris/smartpm/sandbox/cdproblems.py
@@ -2,7 +2,7 @@ import sys
sys.argv = ["./smart.py", "test"]
execfile('./smart.py')
import user
-
+
# Check if upgrading a package would require upgrading another
# package which is in a higher numbered CD.
diff --git a/client/solaris/smartpm/sandbox/fileconflicts.py \
b/client/solaris/smartpm/sandbox/fileconflicts.py index ecfdc97..1d31a6a 100644
--- a/client/solaris/smartpm/sandbox/fileconflicts.py
+++ b/client/solaris/smartpm/sandbox/fileconflicts.py
@@ -109,9 +109,9 @@ def main():
# Is it indirectly conflicted?
if isRequiringConflictingPackage(cl10pkg, cl9pkg):
raise StopIteration
-
+
try:
- problems[(cl9pkg, cl10pkg)].append(path)
+ problems[(cl9pkg, cl10pkg)].append(path)
except KeyError:
problems[(cl9pkg, cl10pkg)] = [path]
diff --git a/client/solaris/smartpm/sandbox/notobsoleting.py \
b/client/solaris/smartpm/sandbox/notobsoleting.py index 841bf54..f42e7a5 100644
--- a/client/solaris/smartpm/sandbox/notobsoleting.py
+++ b/client/solaris/smartpm/sandbox/notobsoleting.py
@@ -18,7 +18,7 @@ def requiredByPackageObsoletingCL9(pkg, donemap=None):
repos = loader.getRepository()
if repos.getName().startswith("cl9"):
raise StopIteration
- if (reqpkg not in donemap and
+ if (reqpkg not in donemap and
requiredByPackageObsoletingCL9(reqpkg, donemap)):
raise StopIteration
except StopIteration:
diff --git a/client/solaris/smartpm/sandbox/qtprogress.py \
b/client/solaris/smartpm/sandbox/qtprogress.py index c1202b1..3669339 100644
--- a/client/solaris/smartpm/sandbox/qtprogress.py
+++ b/client/solaris/smartpm/sandbox/qtprogress.py
@@ -67,7 +67,7 @@ class QtProgress(Progress, QDialog):
def expose(self, topic, percent, subkey, subtopic, subpercent, data):
QDialog.show(self)
-
+
self.topic.setText(topic)
self.progress.setProgress(percent)
diff --git a/client/solaris/smartpm/setup.py b/client/solaris/smartpm/setup.py
index ce772f3..875fa5e 100755
--- a/client/solaris/smartpm/setup.py
+++ b/client/solaris/smartpm/setup.py
@@ -84,7 +84,7 @@ Smart Package Manager is a next generation package handling tool.
["smart/util/cdistance.c"]),
],
data_files = I18NFILES +
- [(PYTHONLIB+"/smart/interfaces/images",
+ [(PYTHONLIB+"/smart/interfaces/images",
glob.glob("smart/interfaces/images/*.png"))],
)
diff --git a/client/solaris/smartpm/smart/backends/deb/base.py \
b/client/solaris/smartpm/smart/backends/deb/base.py index 4062e94..2e1f17b 100644
--- a/client/solaris/smartpm/smart/backends/deb/base.py
+++ b/client/solaris/smartpm/smart/backends/deb/base.py
@@ -54,7 +54,7 @@ DEBARCH = sysconf.get("deb-arch", getArchitecture())
class DebPackage(Package):
packagemanager = DebPackageManager
-
+
def coexists(self, other):
if not isinstance(other, DebPackage):
return True
diff --git a/client/solaris/smartpm/smart/backends/deb/loader.py \
b/client/solaris/smartpm/smart/backends/deb/loader.py index f142df6..3161699 100644
--- a/client/solaris/smartpm/smart/backends/deb/loader.py
+++ b/client/solaris/smartpm/smart/backends/deb/loader.py
@@ -119,7 +119,7 @@ class DebTagLoader(Loader):
continue
if status != "installed":
continue
-
+
name = section.get("package")
version = section.get("version")
diff --git a/client/solaris/smartpm/smart/backends/rpm/header.py \
b/client/solaris/smartpm/smart/backends/rpm/header.py index 8e21245..0c1c365 100644
--- a/client/solaris/smartpm/smart/backends/rpm/header.py
+++ b/client/solaris/smartpm/smart/backends/rpm/header.py
@@ -152,7 +152,7 @@ class RPMHeaderPackageInfo(PackageInfo):
class RPMHeaderLoader(Loader):
__stateversion__ = Loader.__stateversion__+1
-
+
COMPFLAGS = rpm.RPMSENSE_EQUAL|rpm.RPMSENSE_GREATER|rpm.RPMSENSE_LESS
COMPMAP = { rpm.RPMSENSE_EQUAL: "=",
@@ -531,7 +531,7 @@ class RPMDBLoader(RPMHeaderLoader):
return 1
def getHeaders(self, prog):
- # FIXME (20050321): Solaris rpm 4.1 hack
+ # FIXME (20050321): Solaris rpm 4.1 hack
if sys.platform[:5] == "sunos":
rpm.addMacro("_dbPath", sysconf.get("rpm-root", "/"))
ts = rpm.TransactionSet()
@@ -548,7 +548,7 @@ class RPMDBLoader(RPMHeaderLoader):
if rpmhelper:
def getHeader(self, pkg):
- # FIXME (20050321): Solaris rpm 4.1 hack
+ # FIXME (20050321): Solaris rpm 4.1 hack
if sys.platform[:5] == "sunos":
rpm.addMacro("_dbPath", sysconf.get("rpm-root", "/"))
ts = rpm.TransactionSet()
@@ -558,7 +558,7 @@ class RPMDBLoader(RPMHeaderLoader):
return mi.next()
else:
def getHeader(self, pkg):
- # FIXME (20050321): Solaris rpm 4.1 hack
+ # FIXME (20050321): Solaris rpm 4.1 hack
if sys.platform[:5] == "sunos":
rpm.addMacro("_dbPath", sysconf.get("rpm-root", "/"))
ts = rpm.TransactionSet()
@@ -580,7 +580,7 @@ class RPMDBLoader(RPMHeaderLoader):
return None
def loadFileProvides(self, fndict):
- # FIXME (20050321): Solaris rpm 4.1 hack
+ # FIXME (20050321): Solaris rpm 4.1 hack
if sys.platform[:5] == "sunos":
rpm.addMacro("_dbPath", sysconf.get("rpm-root", "/"))
ts = rpm.TransactionSet()
@@ -615,7 +615,7 @@ class RPMDirLoader(RPMHeaderLoader):
return len(self._filenames)
def getHeaders(self, prog):
- # FIXME (20050321): Solaris rpm 4.1 hack
+ # FIXME (20050321): Solaris rpm 4.1 hack
if sys.platform[:5] == "sunos":
rpm.addMacro("_dbPath", sysconf.get("rpm-root", "/"))
ts = rpm.TransactionSet()
@@ -638,7 +638,7 @@ class RPMDirLoader(RPMHeaderLoader):
filename = self._filenames[pkg.loaders[self]]
filepath = os.path.join(self._dir, filename)
file = open(filepath)
- # FIXME (20050321): Solaris rpm 4.1 hack
+ # FIXME (20050321): Solaris rpm 4.1 hack
if sys.platform[:5] == "sunos":
rpm.addMacro("_dbPath", sysconf.get("rpm-root", "/"))
ts = rpm.TransactionSet()
@@ -673,7 +673,7 @@ class RPMDirLoader(RPMHeaderLoader):
return None
def loadFileProvides(self, fndict):
- # FIXME (20050321): Solaris rpm 4.1 hack
+ # FIXME (20050321): Solaris rpm 4.1 hack
if sys.platform[:5] == "sunos":
rpm.addMacro("_dbPath", sysconf.get("rpm-root", "/"))
ts = rpm.TransactionSet()
@@ -692,10 +692,10 @@ class RPMDirLoader(RPMHeaderLoader):
iface.error("%s: %s" % (os.path.basename(filepath), e))
else:
file.close()
- # FIXME (20050321): Solaris rpm 4.1 hack
+ # FIXME (20050321): Solaris rpm 4.1 hack
f = h[1027] # RPMTAG_OLDFILENAMES
if f == None: f = []
- for fn in f:
+ for fn in f:
fn = fndict.get(fn)
if fn:
bfp(self._offsets[i], (RPMProvides, fn, None))
diff --git a/client/solaris/smartpm/smart/backends/rpm/metadata.py \
b/client/solaris/smartpm/smart/backends/rpm/metadata.py index 79d2891..41c09d8 100644
--- a/client/solaris/smartpm/smart/backends/rpm/metadata.py
+++ b/client/solaris/smartpm/smart/backends/rpm/metadata.py
@@ -73,7 +73,7 @@ class RPMMetaDataPackageInfo(PackageInfo):
class RPMMetaDataLoader(Loader):
__stateversion__ = Loader.__stateversion__+1
-
+
def __init__(self, filename, filelistsname, baseurl):
Loader.__init__(self)
self._filename = filename
diff --git a/client/solaris/smartpm/smart/backends/rpm/pm.py \
b/client/solaris/smartpm/smart/backends/rpm/pm.py index bdf4f95..4f5fb7a 100644
--- a/client/solaris/smartpm/smart/backends/rpm/pm.py
+++ b/client/solaris/smartpm/smart/backends/rpm/pm.py
@@ -70,7 +70,7 @@ class RPMPackageManager(PackageManager):
if upgpkg in changeset:
del changeset[upgpkg]
- # FIXME (20050321): Solaris rpm 4.1 hack
+ # FIXME (20050321): Solaris rpm 4.1 hack
if sys.platform[:5] == "sunos":
rpm.addMacro("_dbPath", sysconf.get("rpm-root", "/"))
ts = rpm.TransactionSet()
@@ -245,7 +245,7 @@ class RPMCallback:
self.fd = os.open(path, os.O_RDONLY)
setCloseOnExec(self.fd)
return self.fd
-
+
elif what == rpm.RPMCALLBACK_INST_CLOSE_FILE:
if self.fd is not None:
os.close(self.fd)
diff --git a/client/solaris/smartpm/smart/backends/rpm/redcarpet.py \
b/client/solaris/smartpm/smart/backends/rpm/redcarpet.py index 134cfbe..1ab7286 \
100644
--- a/client/solaris/smartpm/smart/backends/rpm/redcarpet.py
+++ b/client/solaris/smartpm/smart/backends/rpm/redcarpet.py
@@ -64,7 +64,7 @@ class RPMRedCarpetPackageInfo(PackageInfo):
class RPMRedCarpetLoader(Loader):
-
+
def __init__(self, filename, baseurl):
Loader.__init__(self)
self._filename = filename
@@ -289,7 +289,7 @@ class XMLParser(object):
self._lastoffset = offset
self._progress.add(div)
self._progress.show()
-
+
def parse(self):
parser = expat.ParserCreate(namespace_separator=" ")
parser.StartElementHandler = self.startElement
diff --git a/client/solaris/smartpm/smart/backends/rpm/synthesis.py \
b/client/solaris/smartpm/smart/backends/rpm/synthesis.py index 5bdc286..dba8d09 \
100644
--- a/client/solaris/smartpm/smart/backends/rpm/synthesis.py
+++ b/client/solaris/smartpm/smart/backends/rpm/synthesis.py
@@ -70,7 +70,7 @@ class URPMISynthesisLoader(Loader):
def getInfo(self, pkg):
return URPMISynthesisPackageInfo(pkg, self, pkg.loaders[self])
-
+
def getLoadSteps(self):
indexfile = open(self._filename)
total = 0
@@ -79,7 +79,7 @@ class URPMISynthesisLoader(Loader):
total += 1
indexfile.close()
return total
-
+
def splitDepends(self, depsarray, _dependsreÞPENDSRE,
_operationre=OPERATIONRE):
result = []
@@ -185,7 +185,7 @@ class URPMISynthesisLoader(Loader):
upg = (Obs, n, r, v)
upgdict[upg] = True
cnfdict[upg] = True
-
+
pkg = self.buildPackage((Pkg, name, versionarch),
prvdict.keys(), reqdict.keys(),
upgdict.keys(), cnfdict.keys())
diff --git a/client/solaris/smartpm/smart/backends/slack/loader.py \
b/client/solaris/smartpm/smart/backends/slack/loader.py index 9f06a2c..2364b4a 100644
--- a/client/solaris/smartpm/smart/backends/slack/loader.py
+++ b/client/solaris/smartpm/smart/backends/slack/loader.py
@@ -135,7 +135,7 @@ class SlackLoader(Loader):
if self._baseurl:
info["baseurl"] = self._baseurl
-
+
pkg.loaders[self] = info
prog.add(1)
@@ -154,7 +154,7 @@ class SlackDBLoader(SlackLoader):
"/var/log/packages"))
self._dir = dir
self.setInstalled(True)
-
+
def getInfoList(self):
for entry in os.listdir(self._dir):
@@ -173,7 +173,7 @@ class SlackSiteLoader(SlackLoader):
SlackLoader.__init__(self)
self._filename = filename
self._baseurl = baseurl
-
+
def getInfoList(self):
return parsePackageInfo(self._filename)
diff --git a/client/solaris/smartpm/smart/backends/solaris/base.py \
b/client/solaris/smartpm/smart/backends/solaris/base.py index 55bbc06..ae06b62 100644
--- a/client/solaris/smartpm/smart/backends/solaris/base.py
+++ b/client/solaris/smartpm/smart/backends/solaris/base.py
@@ -26,7 +26,7 @@ from smart.cache import *
import fnmatch
import re
-__all__ = ["SolarisPackage", "SolarisProvides", "SolarisDepends",
+__all__ = ["SolarisPackage", "SolarisProvides", "SolarisDepends",
"SolarisUpgrades", "SolarisConflicts"]
class SolarisPackage(Package):
diff --git a/client/solaris/smartpm/smart/backends/solaris/loader.py \
b/client/solaris/smartpm/smart/backends/solaris/loader.py index 4fb029a..50c8694 \
100644
--- a/client/solaris/smartpm/smart/backends/solaris/loader.py
+++ b/client/solaris/smartpm/smart/backends/solaris/loader.py
@@ -54,7 +54,7 @@ class SolarisPackageInfo(PackageInfo):
def getURLs(self):
info = self._info
if "location" in info and "baseurl" in info:
- return [os.path.join(info["baseurl"],
+ return [os.path.join(info["baseurl"],
info["location"],
info["filename"])]
return []
@@ -99,7 +99,7 @@ class SolarisLoader(Loader):
if self._baseurl:
info["baseurl"] = self._baseurl
-
+
pkg.loaders[self] = info
prog.add(1)
@@ -123,7 +123,7 @@ class SolarisDBLoader(SolarisLoader):
self._dir = dir
self._pdir = pdir
self.setInstalled(True)
-
+
def getInfoList(self):
# Packages
@@ -152,7 +152,7 @@ class SolarisDBLoader(SolarisLoader):
if type(output) == type(""):
output = output.splitlines()
for entry in output:
- if not entry.startswith("Patch: "):
+ if not entry.startswith("Patch: "):
continue
info = parsePatchLine(entry.rstrip())
if info and info["name"]:
@@ -240,7 +240,7 @@ class SolarisRHNLoader(SolarisLoader):
def __init__(self, pkgs):
SolarisLoader.__init__(self)
self._pkgs = pkgs
-
+
def getInfoList(self):
infolst = []
for pkg in self._pkgs:
@@ -261,7 +261,7 @@ class SolarisRHNLoader(SolarisLoader):
if name.startswith("patch-solaris-") or \
name.startswith("patch-cluster-solaris-"):
extension = "zip"
-
+
info["filename"] = "%s-%s-%s.%s.%s" % (pkg[0], pkg[1], pkg[2], pkg[4], \
extension)
# Provides
@@ -273,7 +273,7 @@ class SolarisRHNLoader(SolarisLoader):
if len(m) == 1:
name = m[0]
if name:
- if ver:
+ if ver:
ver = ver
else:
ver = None
@@ -351,11 +351,11 @@ def parsePackageInfo(text):
description = line[5:].strip()
elif line.startswith("PSTAMP="):
pstamp = parse_pstamp_string(line[7:].strip())
-
+
info = {}
if not pkg or not name:
return info
-
+
info["name"] = pkg
if pkg.startswith("SUNW"):
info["summary"] = pkg
@@ -496,7 +496,7 @@ def parsePatchLine(line):
# Change them to lists
obsoletes = obsoletes and obsoletes.split(", ") or []
requires = requires and requires.split(", ") or []
-
+
# bug 170725: remove invalid output from showrev -p
# thank you Richard from UBS
my_temp = []
@@ -508,7 +508,7 @@ def parsePatchLine(line):
for my_patch in my_temp:
requires.remove(my_patch)
-
+
conflicts = conflicts and conflicts.split(", ") or []
packages = packages and packages.split(", ") or []
@@ -536,10 +536,10 @@ def parsePatchData(text):
conflicts = conflicts and conflicts.split(" ") or []
elif line.startswith("PKG="):
packages.append(line[4:].strip())
-
+
if not patch:
return {}
-
+
info = createPatchInfo(patch, packages, requires, obsoletes, conflicts)
return info
@@ -656,7 +656,7 @@ def getPatchData(filename):
if not file.endswith("pkginfo"): continue
data = data + z.read(file)
data = data + "\n"
-
+
return data
diff --git a/client/solaris/smartpm/smart/backends/solaris/pm.py \
b/client/solaris/smartpm/smart/backends/solaris/pm.py index 3d99dae..d254042 100644
--- a/client/solaris/smartpm/smart/backends/solaris/pm.py
+++ b/client/solaris/smartpm/smart/backends/solaris/pm.py
@@ -119,7 +119,7 @@ def solinstall(adminfile, path, pkg, prog=None):
else:
# Package install
#template = "pkgadd -a %s -n -d %s %s"
- template = "pkgadd -a %s"
+ template = "pkgadd -a %s"
os_version = os.uname()[2]
if os_version == "5.10":
diff --git a/client/solaris/smartpm/smart/cache.py \
b/client/solaris/smartpm/smart/cache.py index dbc659e..cc2ac5c 100644
--- a/client/solaris/smartpm/smart/cache.py
+++ b/client/solaris/smartpm/smart/cache.py
@@ -512,7 +512,7 @@ class Loader(object):
searcher.addResult(pkg, ratio)
__stateversion__ = 1
-
+
def __getstate__(self):
state = self.__dict__.copy()
state["__stateversion__"] = self.__stateversion__
diff --git a/client/solaris/smartpm/smart/channels/apt_deb.py \
b/client/solaris/smartpm/smart/channels/apt_deb.py index a4d73bd..e7cae57 100644
--- a/client/solaris/smartpm/smart/channels/apt_deb.py
+++ b/client/solaris/smartpm/smart/channels/apt_deb.py
@@ -34,7 +34,7 @@ class APTDEBChannel(PackageChannel):
def __init__(self, baseurl, distro, comps, fingerprint, *args):
super(APTDEBChannel, self).__init__(*args)
-
+
self._baseurl = baseurl
self._distro = distro
self._comps = comps
diff --git a/client/solaris/smartpm/smart/channels/rpm_md.py \
b/client/solaris/smartpm/smart/channels/rpm_md.py index ce6e73f..735b32f 100644
--- a/client/solaris/smartpm/smart/channels/rpm_md.py
+++ b/client/solaris/smartpm/smart/channels/rpm_md.py
@@ -46,7 +46,7 @@ class RPMMetaDataChannel(PackageChannel):
return 3
def fetch(self, fetcher, progress):
-
+
fetcher.reset()
repomd = posixpath.join(self._baseurl, "repodata/repomd.xml")
item = fetcher.enqueue(repomd)
diff --git a/client/solaris/smartpm/smart/channels/rpm_rhn.py \
b/client/solaris/smartpm/smart/channels/rpm_rhn.py index 5890104..011aded 100644
--- a/client/solaris/smartpm/smart/channels/rpm_rhn.py
+++ b/client/solaris/smartpm/smart/channels/rpm_rhn.py
@@ -70,7 +70,7 @@ class RPMRHNLoader(RPMHeaderLoader):
print "m:", "RPMRHNLoader.getDigest"
return 123
-
+
class RPMRHNChannel(PackageChannel):
def __init__(self, baseurl, channel_info, *args):
@@ -87,18 +87,18 @@ class RPMRHNChannel(PackageChannel):
loader = RPMRHNLoader(self.channel_info)
loader.setChannel(self)
self._loaders.append(loader)
-
+
# get package list
# get obsolete list
# setup a loader
# loader probably based on RPMHeaderLoader
-
+
# the loader will need to be able to do
# get header across the net
return True
-
+
def create(alias, data):
return RPMRHNChannel(data['baseurl'],
diff --git a/client/solaris/smartpm/smart/channels/solaris_rhn.py \
b/client/solaris/smartpm/smart/channels/solaris_rhn.py index d12c739..a33313e 100644
--- a/client/solaris/smartpm/smart/channels/solaris_rhn.py
+++ b/client/solaris/smartpm/smart/channels/solaris_rhn.py
@@ -39,7 +39,7 @@ class SolarisRHNChannel(PackageChannel):
def fetch(self, fetcher, progress):
# FIXME (20050517): figure out a way to show progress
-
+
# FIXME (20050517): we need a digest and RPC call to compare
# against latest digest
@@ -65,16 +65,16 @@ class SolarisRHNChannel(PackageChannel):
#print " fetch(), pkgs: ", len(pkgs)
- self._pkgs = pkgs
+ self._pkgs = pkgs
self.removeLoaders()
loader = SolarisRHNLoader(self._pkgs)
loader.setChannel(self)
self._loaders.append(loader)
-
+
return True
-
+
def create(alias, data):
return SolarisRHNChannel(data['baseurl'],
diff --git a/client/solaris/smartpm/smart/channels/urpmi.py \
b/client/solaris/smartpm/smart/channels/urpmi.py index 4891b1e..fd3078d 100644
--- a/client/solaris/smartpm/smart/channels/urpmi.py
+++ b/client/solaris/smartpm/smart/channels/urpmi.py
@@ -143,7 +143,7 @@ class URPMIChannel(PackageChannel):
loader = URPMILoader(localpath, self._baseurl, listpath)
else:
loader = URPMISynthesisLoader(localpath, self._baseurl, listpath)
-
+
loader.setChannel(self)
self._loaders.append(loader)
diff --git a/client/solaris/smartpm/smart/commands/channel.py \
b/client/solaris/smartpm/smart/commands/channel.py index 28383f1..158eaa4 100644
--- a/client/solaris/smartpm/smart/commands/channel.py
+++ b/client/solaris/smartpm/smart/commands/channel.py
@@ -139,7 +139,7 @@ def main(ctrl, opts):
print _("(*) These fields are necessary for this type.")
print
sys.exit(0)
-
+
if opts.add:
if len(opts.add) == 1:
arg = opts.add[0]
@@ -289,7 +289,7 @@ def main(ctrl, opts):
if opts.edit:
sysconf.assertWritable()
-
+
fd, name = tempfile.mkstemp(".ini")
file = os.fdopen(fd, "w")
for alias in sysconf.get("channels"):
diff --git a/client/solaris/smartpm/smart/commands/query.py \
b/client/solaris/smartpm/smart/commands/query.py index ae9cb16..c1dc33e 100644
--- a/client/solaris/smartpm/smart/commands/query.py
+++ b/client/solaris/smartpm/smart/commands/query.py
@@ -294,7 +294,7 @@ def main(ctrl, opts, reloadchannels=True):
newpackages[pkg] = True
packages = newpackages.keys()
-
+
format = opts.format.lower()+"output"
for attr, value in globals().items():
if attr.lower() == format:
@@ -723,7 +723,7 @@ class PrologOutput(NullOutput):
for fact in facts:
print fact
print
-
+
def showPackage(self, pkg):
self.add("package('%s')." % pkg)
if self.opts.show_priority:
diff --git a/client/solaris/smartpm/smart/commands/stats.py \
b/client/solaris/smartpm/smart/commands/stats.py index 8231f3f..7182df0 100644
--- a/client/solaris/smartpm/smart/commands/stats.py
+++ b/client/solaris/smartpm/smart/commands/stats.py
@@ -31,7 +31,7 @@ This command will show some statistics.
""")
EXAMPLES=_("""
-smart stats
+smart stats
""")
def parse_options(argv):
diff --git a/client/solaris/smartpm/smart/control.py \
b/client/solaris/smartpm/smart/control.py index 1bc7940..af408a0 100644
--- a/client/solaris/smartpm/smart/control.py
+++ b/client/solaris/smartpm/smart/control.py
@@ -203,7 +203,7 @@ class Control(object):
def rebuildSysConfChannels(self):
channels = sysconf.get("channels", ())
-
+
forcechannels = sysconf.get("force-channels", "")
if forcechannels:
forcechannels = forcechannels.split(",")
@@ -370,7 +370,7 @@ class Control(object):
progress.setStopped()
progress.show()
progress.stop()
-
+
# Build cache with the new information.
self._cache.load()
@@ -538,7 +538,7 @@ class Control(object):
del channels[channel]
else:
channels[channel] = pkgs
-
+
self._fetcher.setForceCopy(True)
copypkgpaths.update(self.fetchPackages(copypkgs, caching))
self._fetcher.setForceCopy(False)
@@ -641,7 +641,7 @@ class Control(object):
for pkg in self._cache.getPackages(s):
if pkg.name == s or "%s-%s" % (pkg.name, pkg.version) == s:
objects.append((1.0, pkg))
-
+
if not objects:
if "*" in s:
cutoff = globcutoff
diff --git a/client/solaris/smartpm/smart/fetcher.py \
b/client/solaris/smartpm/smart/fetcher.py index 9a58d16..1069d52 100644
--- a/client/solaris/smartpm/smart/fetcher.py
+++ b/client/solaris/smartpm/smart/fetcher.py
@@ -1105,7 +1105,7 @@ class URLLIBHandler(FetcherHandler):
return info
opener = Opener()
-
+
fetcher = self._fetcher
while not self._cancel:
@@ -1291,7 +1291,7 @@ class URLLIB2Handler(FetcherHandler):
def fetch(self):
import urllib2, rfc822
-
+
fetcher = self._fetcher
while True:
@@ -1832,7 +1832,7 @@ class RHNHandler(FetcherHandler):
try:
url = item.getURL()
channel = url.host
- parts = url.path.split("/")[1:-1]
+ parts = url.path.split("/")[1:-1]
pkghash = "/".join(parts)
localpath = self.getLocalPath(item)
# FIXME (20050329): This might not be thread safe because
@@ -1843,13 +1843,13 @@ class RHNHandler(FetcherHandler):
if not os.path.isfile(localpath):
raise Error, _("File not found")
-
+
fetchedsize = os.path.getsize(localpath)
except (Error, IOError, OSError), e:
item.setFailed(unicode(e))
except:
- # Since rhnPackages.downloadPackage() can return many
+ # Since rhnPackages.downloadPackage() can return many
# different exceptions, just set this item to failed so
# that we don't hang.
item.setFailed(unicode(sys.exc_info()[0]))
diff --git a/client/solaris/smartpm/smart/hook.py \
b/client/solaris/smartpm/smart/hook.py index 9b3c074..e1c8f75 100644
--- a/client/solaris/smartpm/smart/hook.py
+++ b/client/solaris/smartpm/smart/hook.py
@@ -25,7 +25,7 @@ import traceback
class Hooks:
def __init__(self):
self._hook = {}
-
+
def register(self, hookname, hookfunc, priorityP0, threaded=0):
hook = self._hook.get(hookname)
if not hook:
@@ -40,10 +40,10 @@ class Hooks:
i = i + 1
else:
hook.append((hookfunc,priority,threaded))
-
+
def unregister(self, hookname, hookfunc, priorityP0, threaded=0):
self._hook[hookname].remove((hookfunc,priority,threaded))
-
+
def call(self, hookname, *hookparam, **hookkwparam):
ret = []
if hookname in self._hook:
diff --git a/client/solaris/smartpm/smart/interfaces/gtk/__init__.py \
b/client/solaris/smartpm/smart/interfaces/gtk/__init__.py index c655397..3eea37d \
100644
--- a/client/solaris/smartpm/smart/interfaces/gtk/__init__.py
+++ b/client/solaris/smartpm/smart/interfaces/gtk/__init__.py
@@ -41,7 +41,7 @@ def create(ctrl, command=None, argv=None):
else:
from smart.interfaces.gtk.interactive import GtkInteractiveInterface
return GtkInteractiveInterface(ctrl)
-
+
_pixbuf = {}
def getPixbuf(name):
diff --git a/client/solaris/smartpm/smart/interfaces/gtk/changes.py \
b/client/solaris/smartpm/smart/interfaces/gtk/changes.py index a946936..77dbb5c \
100644
--- a/client/solaris/smartpm/smart/interfaces/gtk/changes.py
+++ b/client/solaris/smartpm/smart/interfaces/gtk/changes.py
@@ -91,7 +91,7 @@ class GtkChanges(object):
report = Report(changeset)
report.compute()
-
+
class Sorter(str):
ORDER = [_("Remove"), _("Downgrade"), _("Reinstall"),
_("Install"), _("Upgrade")]
diff --git a/client/solaris/smartpm/smart/interfaces/gtk/channels.py \
b/client/solaris/smartpm/smart/interfaces/gtk/channels.py index e6bcd5b..4b789ef \
100644
--- a/client/solaris/smartpm/smart/interfaces/gtk/channels.py
+++ b/client/solaris/smartpm/smart/interfaces/gtk/channels.py
@@ -150,7 +150,7 @@ class GtkChannels(object):
if not disabled:
sysconf.set(("channels", row[1], "disabled"), True)
self._changed = True
-
+
def show(self):
self.fill()
self._window.show()
@@ -221,7 +221,7 @@ class GtkChannels(object):
file.close()
if succ[url].startswith(sysconf.get("data-dir")):
os.unlink(succ[url])
-
+
newchannels = parseChannelsDescription(data)
for alias in newchannels:
newchannel = newchannels[alias]
@@ -264,7 +264,7 @@ class GtkChannels(object):
self._changed = True
if newchannel.get("removable"):
removable.append(alias)
-
+
if not foundchannel:
iface.error(_("No channels detected!"))
return
@@ -556,7 +556,7 @@ class ChannelEditor(object):
value = newchannel["alias"]
if not value:
raise Error, _("Invalid alias!")
- if (value != alias and
+ if (value != alias and
sysconf.has(("channels", value))):
raise Error, _("Alias already in use!")
if not alias:
@@ -601,7 +601,7 @@ class TypeSelector(object):
table.set_col_spacings(10)
table.show()
vbox.pack_start(table)
-
+
label = gtk.Label(_("Type:"))
label.set_alignment(1.0, 0.0)
label.show()
@@ -696,7 +696,7 @@ class MethodSelector(object):
table.set_col_spacings(10)
table.show()
vbox.pack_start(table)
-
+
label = gtk.Label(_("Method:"))
label.set_alignment(1.0, 0.0)
label.show()
@@ -798,7 +798,7 @@ class MountPointSelector(object):
table.set_col_spacings(10)
table.show()
vbox.pack_start(table)
-
+
label = gtk.Label(_("Media path:"))
label.set_alignment(1.0, 0.0)
label.show()
diff --git a/client/solaris/smartpm/smart/interfaces/gtk/command.py \
b/client/solaris/smartpm/smart/interfaces/gtk/command.py index a81f48e..6b1c04a \
100644
--- a/client/solaris/smartpm/smart/interfaces/gtk/command.py
+++ b/client/solaris/smartpm/smart/interfaces/gtk/command.py
@@ -42,7 +42,7 @@ class GtkCommandInterface(GtkInterface):
gtk.main_iteration()
def run(self, command=None, argv=None):
- result = GtkInterface.run(self, command, argv)
+ result = GtkInterface.run(self, command, argv)
self._status.wait()
while self._log.isVisible():
time.sleep(0.1)
diff --git a/client/solaris/smartpm/smart/interfaces/gtk/flags.py \
b/client/solaris/smartpm/smart/interfaces/gtk/flags.py index a5ffa0a..bf9ae2c 100644
--- a/client/solaris/smartpm/smart/interfaces/gtk/flags.py
+++ b/client/solaris/smartpm/smart/interfaces/gtk/flags.py
@@ -171,7 +171,7 @@ class GtkFlags(object):
flaglst.sort()
for flag in flaglst:
self._flagsmodel.append((flag,))
-
+
def fillTargets(self):
self._targetsmodel.clear()
if self._flag:
@@ -310,7 +310,7 @@ class FlagCreator(object):
table.set_col_spacings(10)
table.show()
vbox.pack_start(table)
-
+
label = gtk.Label(_("Name:"))
label.set_alignment(1.0, 0.5)
label.show()
@@ -391,7 +391,7 @@ class TargetCreator(object):
table.set_col_spacings(10)
table.show()
vbox.pack_start(table)
-
+
label = gtk.Label(_("Target:"))
label.set_alignment(1.0, 0.5)
label.show()
diff --git a/client/solaris/smartpm/smart/interfaces/gtk/interactive.py \
b/client/solaris/smartpm/smart/interfaces/gtk/interactive.py index 2505372..94f585f \
100644
--- a/client/solaris/smartpm/smart/interfaces/gtk/interactive.py
+++ b/client/solaris/smartpm/smart/interfaces/gtk/interactive.py
@@ -542,7 +542,7 @@ class GtkInteractiveInterface(GtkInterface):
inconsistent = True
else:
for pkg in pkgs:
- if (names and pkg.name in names and
+ if (names and pkg.name in names and
("=", pkg.version) in names[pkg.name]):
newthislocked = True
newalllocked = len(names[pkg.name]) > 1
diff --git a/client/solaris/smartpm/smart/interfaces/gtk/mirrors.py \
b/client/solaris/smartpm/smart/interfaces/gtk/mirrors.py index 27b5486..f6bed97 \
100644
--- a/client/solaris/smartpm/smart/interfaces/gtk/mirrors.py
+++ b/client/solaris/smartpm/smart/interfaces/gtk/mirrors.py
@@ -94,7 +94,7 @@ class GtkMirrors(object):
for mirror in mirrors[origin]:
iter = self._treemodel.append(parent, (mirror,))
self._treeview.expand_all()
-
+
def show(self):
self.fill()
self._window.show()
@@ -181,7 +181,7 @@ class MirrorCreator(object):
table.set_col_spacings(10)
table.show()
vbox.pack_start(table)
-
+
label = gtk.Label(_("Origin URL:"))
label.set_alignment(1.0, 0.5)
label.show()
diff --git a/client/solaris/smartpm/smart/interfaces/gtk/packageinfo.py \
b/client/solaris/smartpm/smart/interfaces/gtk/packageinfo.py index 5ea87c4..ba01f92 \
100644
--- a/client/solaris/smartpm/smart/interfaces/gtk/packageinfo.py
+++ b/client/solaris/smartpm/smart/interfaces/gtk/packageinfo.py
@@ -325,7 +325,7 @@ class GtkPackageInfo(gtk.Alignment):
for prv in pkg.provides:
prvmap = {}
-
+
requiredby = []
for req in prv.requiredby:
requiredby.extend(req.packages)
diff --git a/client/solaris/smartpm/smart/interfaces/gtk/packageview.py \
b/client/solaris/smartpm/smart/interfaces/gtk/packageview.py index 915a359..f45962d \
100644
--- a/client/solaris/smartpm/smart/interfaces/gtk/packageview.py
+++ b/client/solaris/smartpm/smart/interfaces/gtk/packageview.py
@@ -47,7 +47,7 @@ class PixbufCellRenderer(gtk.GenericCellRenderer):
height = self.pixbuf.get_height()
xpad = self.get_property("xpad")
ypad = self.get_property("ypad")
- if (cell_area.x+xpad < event.x < cell_area.x+xpad+width and
+ if (cell_area.x+xpad < event.x < cell_area.x+xpad+width and
cell_area.y+ypad < event.y < cell_area.y+ypad+height):
self.activate(path)
diff --git a/client/solaris/smartpm/smart/interfaces/gtk/priorities.py \
b/client/solaris/smartpm/smart/interfaces/gtk/priorities.py index e3cb200..20c6b27 \
100644
--- a/client/solaris/smartpm/smart/interfaces/gtk/priorities.py
+++ b/client/solaris/smartpm/smart/interfaces/gtk/priorities.py
@@ -219,7 +219,7 @@ class PriorityCreator(object):
table.set_col_spacings(10)
table.show()
vbox.pack_start(table)
-
+
label = gtk.Label(_("Package Name:"))
label.set_alignment(1.0, 0.5)
label.show()
@@ -345,7 +345,7 @@ class GtkSinglePriority(object):
def show(self, pkg):
priority = sysconf.get(("package-priorities", pkg.name), {})
-
+
table = self._table
table.foreach(table.remove)
@@ -439,7 +439,7 @@ class GtkSinglePriority(object):
spin.show()
chantable.attach(spin, 1, 2, pos, pos+1, gtk.FILL, gtk.FILL)
pos += 1
-
+
self._window.show()
gtk.main()
self._window.hide()
diff --git a/client/solaris/smartpm/smart/interfaces/gtk/progress.py \
b/client/solaris/smartpm/smart/interfaces/gtk/progress.py index 957c6cd..6afcb85 \
100644
--- a/client/solaris/smartpm/smart/interfaces/gtk/progress.py
+++ b/client/solaris/smartpm/smart/interfaces/gtk/progress.py
@@ -182,7 +182,7 @@ class GtkProgress(Progress, gtk.Window):
def expose(self, topic, percent, subkey, subtopic, subpercent, data, done):
gtk.Window.show(self)
-
+
if self._hassub and subkey:
if subkey in self._subiters:
iter = self._subiters[subkey]
@@ -228,11 +228,11 @@ gobject.type_register(GtkProgress)
class ProgressCellRenderer(gtk.GenericCellRenderer):
__gproperties__ = {
- "percent": (gobject.TYPE_INT, "Percent",
+ "percent": (gobject.TYPE_INT, "Percent",
"Progress percentage", 0, 100, 0,
gobject.PARAM_READWRITE),
}
-
+
def __init__(self):
self.__gobject_init__()
self.percent = 0
diff --git a/client/solaris/smartpm/smart/interfaces/text/interactive.py \
b/client/solaris/smartpm/smart/interfaces/text/interactive.py index 9d9b858..ab8b133 \
100644
--- a/client/solaris/smartpm/smart/interfaces/text/interactive.py
+++ b/client/solaris/smartpm/smart/interfaces/text/interactive.py
@@ -566,7 +566,7 @@ class Interpreter(Cmd):
if alias.startswith(text):
matches.append(alias)
return matches
-
+
def do_update(self, line):
args = shlex.split(line)
if args:
diff --git a/client/solaris/smartpm/smart/interfaces/text/interface.py \
b/client/solaris/smartpm/smart/interfaces/text/interface.py index b46eee1..8dc9e16 \
100644
--- a/client/solaris/smartpm/smart/interfaces/text/interface.py
+++ b/client/solaris/smartpm/smart/interfaces/text/interface.py
@@ -126,7 +126,7 @@ class TextInterface(Interface):
return self.askOkCancel(_("Continue?"), True)
# Non-standard interface methods:
-
+
def showChangeSet(self, changeset, keep=None, confirmúlse):
self.hideStatus()
report = Report(changeset)
diff --git a/client/solaris/smartpm/smart/interfaces/up2date/interface.py \
b/client/solaris/smartpm/smart/interfaces/up2date/interface.py index 73bff16..ee7e1cc \
100644
--- a/client/solaris/smartpm/smart/interfaces/up2date/interface.py
+++ b/client/solaris/smartpm/smart/interfaces/up2date/interface.py
@@ -132,7 +132,7 @@ class Up2dateInterface(Interface):
result = install.main(self._ctrl, opts, \
RHNSolarisGreedyPolicyInstall) else:
result = install.main(self._ctrl, opts, RHNSolarisPolicyInstall)
-
+
if action == "list":
pkgs = self.getRHNPackages()
print _("""
@@ -419,36 +419,36 @@ class RHNSolarisPolicyInstall(PolicyInstall):
# Let T be the package we wish to find the best provider for.
# Let P be the set of patches which was determined to provide T.
# For each P[i], let X be the the set of patches that provides P[i].
- #
- # We determine qualification based on count(X) for each P[i]. The
- # lower the count(X), the more qualified P[i] is, and the higher it
+ #
+ # We determine qualification based on count(X) for each P[i]. The
+ # lower the count(X), the more qualified P[i] is, and the higher it
# will be weighted.
- #
+ #
# In the SmartPM dep solver, a lower weight indicates a better match.
- # Therefore, at the end of this algorithm, the P[i] with the lowest
+ # Therefore, at the end of this algorithm, the P[i] with the lowest
# count(X) should be the lowest-weighted. In the event of a tie, where
# more than one P[i] is of equally low weight, we allow the "winner" to
# be arbitrarily picked by the calling code.
- #
- # If P[i] is not a patch, it must be a package. In this case, we
- # automatically weight it with the highest value and exclude it from
- # our search. We never want a package to override a patch. We
+ #
+ # If P[i] is not a patch, it must be a package. In this case, we
+ # automatically weight it with the highest value and exclude it from
+ # our search. We never want a package to override a patch. We
# shouldn't see this scenario, but we'll account for it just in case.
- #
- # This algorithm makes a number of assumptions based on extensive
- # observations of the Solaris patch distribution web page at SunSolve
+ #
+ # This algorithm makes a number of assumptions based on extensive
+ # observations of the Solaris patch distribution web page at SunSolve
# (http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/patch-access).
# These are:
- #
- # - If a patch P2 obsoletes another path, P1, then P2 will provide
+ #
+ # - If a patch P2 obsoletes another path, P1, then P2 will provide
# both P2 and P1.
- #
- # - If a patch P3 then obsoletes P2, P3 will provide both P3, P2,
+ #
+ # - If a patch P3 then obsoletes P2, P3 will provide both P3, P2,
# and P1.
- #
- # - In no case will two patches, P4 and P3, both obsolete another
+ #
+ # - In no case will two patches, P4 and P3, both obsolete another
# patch P2 without P4 also obsoleting P3 or vice-versa. In other
- # words, patches must be accumulated in a hierarchical manner;
+ # words, patches must be accumulated in a hierarchical manner;
# two or more patches may not accumulate another at the same tree
# level.
@@ -457,8 +457,8 @@ class RHNSolarisPolicyInstall(PolicyInstall):
# First, populate the result set with the lowest possible weights.
# Then, create a mapping between package names and the actual package
- # objects. Since pkg.provides is a collection of Provides objects,
- # this will allow us to efficiently reference back to the original
+ # objects. Since pkg.provides is a collection of Provides objects,
+ # this will allow us to efficiently reference back to the original
# packages.
for providingPkg in providingPkgs:
result[providingPkg] = 0.0
@@ -468,7 +468,7 @@ class RHNSolarisPolicyInstall(PolicyInstall):
# providers for each patch.
for providingPkg in providingPkgs:
- # Non-patches just don't make sense in this context. Give them a
+ # Non-patches just don't make sense in this context. Give them a
# very high weight.
if not providingPkg.isPatch():
result[providingPkg] = 9999999.0
@@ -487,7 +487,7 @@ class RHNSolarisPolicyInstall(PolicyInstall):
class RHNSolarisGreedyPolicyInstall(RHNSolarisPolicyInstall):
-
+
def getWeight(self, changeset):
# Do not peanlize for bringing in extra packages
# BZ: #428490
diff --git a/client/solaris/smartpm/smart/media.py \
b/client/solaris/smartpm/smart/media.py index 137bab6..e5ee4da 100644
--- a/client/solaris/smartpm/smart/media.py
+++ b/client/solaris/smartpm/smart/media.py
@@ -257,7 +257,7 @@ class UmountMedia(Media):
def umount(self):
if not self.isMounted():
return True
- status, output = commands.getstatusoutput("umount %s" %
+ status, output = commands.getstatusoutput("umount %s" %
self._mountpoint)
if status != 0:
iface.debug(output)
diff --git a/client/solaris/smartpm/smart/mirror.py \
b/client/solaris/smartpm/smart/mirror.py index 5df3130..ed1f734 100644
--- a/client/solaris/smartpm/smart/mirror.py
+++ b/client/solaris/smartpm/smart/mirror.py
@@ -68,7 +68,7 @@ class MirrorSystem(object):
count += 1+len(self._mirrors[origin])
del self._history[count*HISTORYPERMIRROR:]
- def get(self, url):
+ def get(self, url):
elements = {}
for origin in self._mirrors:
if url.startswith(origin):
diff --git a/client/solaris/smartpm/smart/pkgconfig.py \
b/client/solaris/smartpm/smart/pkgconfig.py index d2884da..61f65de 100644
--- a/client/solaris/smartpm/smart/pkgconfig.py
+++ b/client/solaris/smartpm/smart/pkgconfig.py
@@ -21,7 +21,7 @@
#
class PkgConfig(object):
-
+
def __init__(self, config):
self._config = config
diff --git a/client/solaris/smartpm/smart/plugins/debdir.py \
b/client/solaris/smartpm/smart/plugins/debdir.py index 5c8d346..2145978 100644
--- a/client/solaris/smartpm/smart/plugins/debdir.py
+++ b/client/solaris/smartpm/smart/plugins/debdir.py
@@ -30,8 +30,8 @@ if sysconf.has("deb-dir"):
"deb-dir",
"deb-dir-option",
_("Dynamic DEB Directory"),
- True, False, 0)
+ True, False, 0)
return [channel]
-
+
hooks.register("rebuild-dynamic-channels", createDebDirChannel)
diff --git a/client/solaris/smartpm/smart/plugins/rpmdir.py \
b/client/solaris/smartpm/smart/plugins/rpmdir.py index 42c9e87..6bef27a 100644
--- a/client/solaris/smartpm/smart/plugins/rpmdir.py
+++ b/client/solaris/smartpm/smart/plugins/rpmdir.py
@@ -30,7 +30,7 @@ if sysconf.has("rpm-dir"):
"rpm-dir",
"rpm-dir-option",
_("Dynamic RPM Directory"),
- True, False, 0)
+ True, False, 0)
return [channel]
-
+
hooks.register("rebuild-dynamic-channels", createRPMDirChannel)
diff --git a/client/solaris/smartpm/smart/searcher.py \
b/client/solaris/smartpm/smart/searcher.py index b9f7a3b..b22b397 100644
--- a/client/solaris/smartpm/smart/searcher.py
+++ b/client/solaris/smartpm/smart/searcher.py
@@ -29,7 +29,7 @@ class Searcher(object):
"""
The search mechanism is smart is accessed mainly by giving a
Searcher instance to the cache.search() method.
-
+
Internally, the searching may go through different paths depending
on the kind of information being looked for. More specifically:
diff --git a/client/solaris/smartpm/smart/sorter.py \
b/client/solaris/smartpm/smart/sorter.py index a9bbc1c..db377c7 100644
--- a/client/solaris/smartpm/smart/sorter.py
+++ b/client/solaris/smartpm/smart/sorter.py
@@ -154,7 +154,7 @@ class ElementSorter(object):
dct = self._successors.get(elem)
if dct:
for succ, kind in dct.keys():
-
+
# Should we care about this relation?
if succ not in loops:
continue
@@ -190,7 +190,7 @@ class ElementSorter(object):
continue
# We have an enforced relation. Let's check if we
- # have OR groups that could satisfy it.
+ # have OR groups that could satisfy it.
groups = self._groups.get(tup)
if groups:
# Any enforced AND groups tell us we can't
@@ -280,7 +280,7 @@ class ElementSorter(object):
del reclock[tup]
if not broke:
result = False
-
+
return result
def _breakRelation(self, pred, succ, kind):
@@ -491,7 +491,7 @@ class ElementSorter(object):
print "Number of relation groups:", ngroups
print "Number of enforced relations:", enforce
print "Number of optional relations:", optional
-
+
self._profile_start = time.clock()
elif id == 2:
print "Number of disabled relations:", len(self._disabled)
diff --git a/client/solaris/smartpm/smart/transaction.py \
b/client/solaris/smartpm/smart/transaction.py index a73cdac..3535e50 100644
--- a/client/solaris/smartpm/smart/transaction.py
+++ b/client/solaris/smartpm/smart/transaction.py
@@ -866,7 +866,7 @@ class Transaction(object):
if csweight < weight:
weight = csweight
changeset.setState(cs)
-
+
def _fix(self, pkgs, changeset, locked, pending, depth=0):
#print "[%03d] _fix()" % depth
#depth += 1
@@ -1171,7 +1171,7 @@ class ChangeSetSplitter(object):
if found:
continue
- needed = (not wasbroken and
+ needed = (not wasbroken and
(self._forcerequires or
isinstance(req, PreRequires)))
diff --git a/client/solaris/smartpm/smart/uncompress.py \
b/client/solaris/smartpm/smart/uncompress.py index 9fceca9..4bfded4 100644
--- a/client/solaris/smartpm/smart/uncompress.py
+++ b/client/solaris/smartpm/smart/uncompress.py
@@ -24,7 +24,7 @@ from smart import *
class Uncompressor(object):
- _handlers = []
+ _handlers = []
def addHandler(self, handler):
self._handlers.append(handler())
diff --git a/client/solaris/smartpm/smart/util/objdigest.py \
b/client/solaris/smartpm/smart/util/objdigest.py index a40300e..241a261 100644
--- a/client/solaris/smartpm/smart/util/objdigest.py
+++ b/client/solaris/smartpm/smart/util/objdigest.py
@@ -40,7 +40,7 @@ class ObjectDigest(object):
def getHexDigest(self):
return self._digest.hexdigest()
-
+
def addObject(self, obj):
cPickle.dump(obj, DigestFile(self._digest), 2)
diff --git a/client/solaris/smartpm/smart/util/pathlocks.py \
b/client/solaris/smartpm/smart/util/pathlocks.py index a388ca7..fe57766 100644
--- a/client/solaris/smartpm/smart/util/pathlocks.py
+++ b/client/solaris/smartpm/smart/util/pathlocks.py
@@ -23,7 +23,7 @@ import fcntl
import os, sys
class PathLocks(object):
-
+
def __init__(self, force=True):
self._lock = {}
self._force = bool(force)
diff --git a/client/solaris/smartpm/smart/util/pexpect.py \
b/client/solaris/smartpm/smart/util/pexpect.py index bafb109..7cf54f8 100644
--- a/client/solaris/smartpm/smart/util/pexpect.py
+++ b/client/solaris/smartpm/smart/util/pexpect.py
@@ -90,7 +90,7 @@ class spawn:
p = pexpect.spawn ('/usr/bin/ssh', ['user@example.com'])
p = pexpect.spawn ('ls', ['-latr', '/tmp'])
After this the child application will be created and
- will be ready to talk to. For normal use, see expect() and
+ will be ready to talk to. For normal use, see expect() and
send() and sendline().
If the command parameter is an integer AND a valid file descriptor
@@ -116,7 +116,7 @@ class spawn:
self.__child_fd_owner = None
self.exitstatus = None
self.pid = None
- self.log_file = None
+ self.log_file = None
self.before = None
self.after = None
self.match = None
@@ -124,21 +124,21 @@ class spawn:
self.name = '' # File-like object.
self.flag_eof = 0
- # NEW -- to support buffering -- the ability to read more than one
+ # NEW -- to support buffering -- the ability to read more than one
# byte from a TTY at a time. See setmaxread() method.
self.buffer = ''
self.maxread = 1 # Maximum to read at a time
### IMPLEMENT THIS FEATURE!!!
# anything before maxsearchsize point is preserved, but not searched.
#self.maxsearchsize = 1000
-
+
# If command is an int type then it must represent an open file descriptor.
if type (command) == type(0):
try: # Command is an int, so now check if it is a file descriptor.
os.fstat(command)
except OSError:
raise ExceptionPexpect, 'Command is an int type, yet is not a valid \
file descriptor.'
- self.pid = -1
+ self.pid = -1
self.child_fd = command
self.__child_fd_owner = 0 # Sets who is reponsible for the child_fd
self.args = None
@@ -277,7 +277,7 @@ class spawn:
def setlog (self, fileobject):
"""This sets logging output to go to the given fileobject.
- Set fileobject to None to stop logging.
+ Set fileobject to None to stop logging.
Example:
child = pexpect.spawn('some_command')
fout = file('mylog.txt','w')
@@ -304,13 +304,13 @@ class spawn:
If a log file was set using setlog() then all data will
also be written to the log file.
- Notice that if this method is called with timeout=None
+ Notice that if this method is called with timeout=None
then it actually may block.
This is a non-blocking wrapper around os.read().
- It uses select.select() to implement a timeout.
+ It uses select.select() to implement a timeout.
"""
-
+
if self.child_fd == -1:
raise ValueError ('I/O operation on closed file')
@@ -324,7 +324,7 @@ class spawn:
if not r:
self.flag_eof = 1
raise EOF ('End Of File (EOF) in read(). Braindead platform.')
-
+
r, w, e = select.select([self.child_fd], [], [], timeout)
if not r:
raise TIMEOUT('Timeout exceeded in read().')
@@ -342,21 +342,21 @@ class spawn:
if s == '':
self.flag_eof = 1
raise EOF('End Of File (EOF) in read(). Empty string style \
platform.')
-
+
if self.log_file != None:
self.log_file.write (s)
self.log_file.flush()
-
+
return s
raise ExceptionPexpect('Reached an unexpected state in read().')
def read (self, size = -1): # File-like object.
- """This reads at most size bytes from the file
- (less if the read hits EOF before obtaining size bytes).
- If the size argument is negative or omitted,
- read all data until EOF is reached.
- The bytes are returned as a string object.
+ """This reads at most size bytes from the file
+ (less if the read hits EOF before obtaining size bytes).
+ If the size argument is negative or omitted,
+ read all data until EOF is reached.
+ The bytes are returned as a string object.
An empty string is returned when EOF is encountered immediately.
"""
if size == 0:
@@ -370,16 +370,16 @@ class spawn:
# I would catch any bugs early and ensure consistant behavior.
# It's a little less efficient, but there is less for me to
# worry about if I have to later modify read() or expect().
- cre = re.compile('.{%d}' % size, re.DOTALL)
+ cre = re.compile('.{%d}' % size, re.DOTALL)
index = self.expect ([cre, EOF])
if index == 0:
return self.after ### self.before should be ''. Should I assert this?
return self.before
-
+
def readline (self, size = -1): # File-like object.
"""This reads and returns one entire line. A trailing newline is kept in
- the string, but may be absent when a file ends with an incomplete line.
- Note: This readline() looks for a \\r\\n pair even on UNIX because this is
+ the string, but may be absent when a file ends with an incomplete line.
+ Note: This readline() looks for a \\r\\n pair even on UNIX because this is
what the pseudo tty device returns. So contrary to what you may be used to
you will receive a newline as \\r\\n.
An empty string is returned when EOF is hit immediately.
@@ -408,9 +408,9 @@ class spawn:
return result
def readlines (self, sizehint = -1): # File-like object.
- """This reads until EOF using readline() and returns a list containing
+ """This reads until EOF using readline() and returns a list containing
the lines thus read. The optional sizehint argument is ignored.
- """
+ """
lines = []
while 1:
line = self.readline()
@@ -426,7 +426,7 @@ class spawn:
def writelines (self, sequence): # File-like object.
"""This calls write() for each element in the sequence.
- The sequence can be any iterable object producing strings,
+ The sequence can be any iterable object producing strings,
typically a list of strings. This does not add line separators
There is no return value.
"""
@@ -453,8 +453,8 @@ class spawn:
buffer to be sent to the waiting child program without
waiting for end-of-line. If it is the first character of the
line, the read() in the user program returns 0, which
- signifies end-of-file. This means to work as expected
- a sendeof() has to be called at the begining of a line.
+ signifies end-of-file. This means to work as expected
+ a sendeof() has to be called at the begining of a line.
This method does not send a newline. It is the responsibility
of the caller to ensure the eof is sent at the beginning of a line.
"""
@@ -491,7 +491,7 @@ class spawn:
# If this class was created from an existing file descriptor then
# I just check to see if the file descriptor is still valid.
- if self.pid == -1 and not self.__child_fd_owner:
+ if self.pid == -1 and not self.__child_fd_owner:
try:
os.fstat(self.child_fd)
return 1
@@ -539,7 +539,7 @@ class spawn:
def compile_pattern_list(self, patterns):
"""This compiles a pattern-string or a list of pattern-strings.
- Patterns must be a StringType, EOF, TIMEOUT, SRE_Pattern, or
+ Patterns must be a StringType, EOF, TIMEOUT, SRE_Pattern, or
a list of those.
This is used by expect() when calling expect_list().
@@ -573,7 +573,7 @@ class spawn:
raise TypeError, 'Argument must be one of StringType, EOF, TIMEOUT, \
SRE_Pattern, or a list of those type. %s' % str(type(p))
return compiled_pattern_list
-
+
def expect(self, pattern, timeout = -1):
"""This seeks through the stream until a pattern is matched.
The pattern is overloaded and may take several types including a list.
@@ -658,14 +658,14 @@ class spawn:
#ED# incoming = ''
incoming = self.buffer
while 1: # Keep reading until exception or return.
- #ED# c = self.read_nonblocking (1, timeout)
+ #ED# c = self.read_nonblocking (1, timeout)
#ED# incoming = incoming + c
# Sequence through the list of patterns and look for a match.
index = -1
for str_target in pattern_list:
index = index + 1
- if str_target is EOF or str_target is TIMEOUT:
+ if str_target is EOF or str_target is TIMEOUT:
continue # The Exception patterns are handled differently.
match_index = incoming.find (str_target)
if match_index >= 0:
@@ -674,9 +674,9 @@ class spawn:
self.buffer = incoming [match_index + len(str_target):]
self.match = None
return index
- c = self.read_nonblocking (self.maxread, timeout)
+ c = self.read_nonblocking (self.maxread, timeout)
incoming = incoming + c
-
+
except EOF:
self.before = incoming
self.after = EOF
@@ -699,10 +699,10 @@ class spawn:
self.match = None
self.buffer = ''
raise
-
+
def expect_list(self, pattern_list, timeout = -1):
"""
- This takes a list of compiled regular expressions and returns
+ This takes a list of compiled regular expressions and returns
the index into the pattern_list that matched the child's output.
This is called by expect(). It is similar to the expect() method
except that expect_list() is not overloaded and it does not have to
@@ -715,7 +715,7 @@ class spawn:
if timeout == -1:
timeout = self.timeout
-
+
try:
#ED# incoming = ''
incoming = self.buffer
@@ -727,7 +727,7 @@ class spawn:
index = -1
for cre in pattern_list:
index = index + 1
- if cre is EOF or cre is TIMEOUT:
+ if cre is EOF or cre is TIMEOUT:
continue # The patterns for PexpectExceptions are handled \
differently. match = cre.search(incoming)
if match is not None:
@@ -739,7 +739,7 @@ class spawn:
# Read more data
c = self.read_nonblocking (self.maxread, timeout)
incoming = incoming + c
-
+
except EOF:
self.before = incoming
self.after = EOF
@@ -863,7 +863,7 @@ def _which (filename):
# Oddly enough this was the one line that made Pexpect
# incompatible with Python 1.5.2.
- #pathlist = p.split (os.pathsep)
+ #pathlist = p.split (os.pathsep)
pathlist = string.split (p, os.pathsep)
for path in pathlist:
@@ -911,7 +911,7 @@ def _split_command_line(command_line):
if c != '\\'and state_esc: # escape mode lasts for one character.
state_esc = 0
- # Handle last argument.
+ # Handle last argument.
if arg != '':
arg_list.append(arg)
return arg_list
@@ -942,7 +942,7 @@ def _split_command_line(command_line):
# Nonblocking on Win32?
# Reasearch this as a way to maybe make pipe work for Win32.
# http://groups.google.com/groups?q=setraw+tty&hl=en&selm=uvgpvisvk.fsf%40roundpoint.com&rnum=7
-#
+#
# if istty:
# if os.name=='posix':
# import tty
@@ -989,10 +989,10 @@ def _split_command_line(command_line):
## self.buffer = ''
##
## def read(self, n, timeout = None):
-## """This does a read restricted by a timeout and
-## it includes any cached data from previous calls.
+## """This does a read restricted by a timeout and
+## it includes any cached data from previous calls.
## This is a non-blocking wrapper around os.read.
-## it uses select.select to supply a timeout.
+## it uses select.select to supply a timeout.
## Note that if this is called with timeout=None (the default)
## then this actually MAY block.
## """
diff --git a/client/tools/action-rpms/rhn-applet-actions/rhn_applet.py \
b/client/tools/action-rpms/rhn-applet-actions/rhn_applet.py index e97e469..d1ce6ed \
100755
--- a/client/tools/action-rpms/rhn-applet-actions/rhn_applet.py
+++ b/client/tools/action-rpms/rhn-applet-actions/rhn_applet.py
@@ -8,10 +8,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -47,25 +47,25 @@ def _get_uuid_config():
return cfg
def _create_server_obj(server_url):
-
+
enable_proxy = read_cfg_val(cfg, 'enableProxy')
enable_proxy_auth = read_cfg_val(cfg, 'enableProxyAuth')
proxy_host = None
proxy_user = None
proxy_password = None
-
+
if enable_proxy:
proxy_host = self._local_config.get('httpProxy')
-
+
if enable_proxy_auth:
proxy_user = read_cfg_val(cfg, 'proxyUser')
proxy_password = read_cfg_val(cfg, 'proxyPassword')
-
+
ca = read_cfg_val(cfg, 'sslCACert')
-
+
if type(ca) == type(""):
ca = [ca]
-
+
ca_certs = ca or ["/usr/share/rhn/RHNS-CA-CERT"]
lang = None
@@ -83,16 +83,16 @@ def _create_server_obj(server_url):
proxy=proxy_host,
username=proxy_user,
password=proxy_password)
-
+
#server.set_transport_flags(encoding="gzip", transfer="binary")
-
+
if lang:
server.setlang(lang)
-
+
for ca_cert in ca_certs:
if not os.access(ca_cert, os.R_OK):
raise Exception("could not find cert %s" % ca_cert)
-
+
server.add_trusted_cert(ca_cert)
return server
@@ -103,13 +103,13 @@ def read_cfg_val(obj, key):
if obj.has_key(key):
return obj[key]
return None
-
+
def update_applet_cfg():
server_url = config.getServerlURL()[0]
# get up2date's conf vals...
new_ca = read_cfg_val(cfg, 'sslCACert')
- # TODO: applet needs to support failover
+ # TODO: applet needs to support failover
# for now patch the ca
if type(new_ca) == type([]):
new_ca_buf = "%s" % (string.join(map(str, new_ca), ';'))
@@ -127,20 +127,20 @@ def update_applet_cfg():
up2date_uuid_cfg = _get_uuid_config()
uuid = read_cfg_val(up2date_uuid_cfg, "rhnuuid")
-
- try:
+
+ try:
# 2. create new file
fd = os.open(new_filename, os.O_RDWR | os.O_CREAT | os.O_EXCL, 0644)
new_file = os.fdopen(fd, 'w')
new_file.seek(0)
seen_ca_cert = 0
-
+
for line in string.split(contents, "\n"):
- if line.startswith('server_url='):
+ if line.startswith('server_url='):
new_file.write("server_url=%s\n\n" % new_url)
continue
-
+
if line.startswith('uuid='):
if uuid:
# Use the up2date uuid instead
@@ -150,7 +150,7 @@ def update_applet_cfg():
uuid = (string.split(line, '='))[1]
new_file.write(line + '\n\n')
continue
-
+
if line.startswith('use_ca_cert='):
seen_ca_cert = 1
new_file.write("use_ca_cert=%s\n" % new_ca_buf)
@@ -160,7 +160,7 @@ def update_applet_cfg():
new_file.write("use_ca_cert=%s\n" % new_ca_buf)
new_file.close()
-
+
# 3. rename current to backup
os.rename(APPLET_CONF, backup_filename)
# 4. rename new to current
@@ -188,7 +188,7 @@ def use_satellite():
except Exception, e:
return (1, "unable to tie rhn-applet uuid to systemid: %s" % e, {})
-
+
return (0, "rhn-applet now configured to use %s" % new_url, {})
diff --git a/client/tools/osad/invocation.py b/client/tools/osad/invocation.py
index 25aecad..3335568 100755
--- a/client/tools/osad/invocation.py
+++ b/client/tools/osad/invocation.py
@@ -8,10 +8,10 @@
# 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.
+# in this software or its documentation.
#
import os
diff --git a/client/tools/osad/src/_ConfigParser.py \
b/client/tools/osad/src/_ConfigParser.py index e45a238..ad65602 100644
--- a/client/tools/osad/src/_ConfigParser.py
+++ b/client/tools/osad/src/_ConfigParser.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
# Modified from Python 2.x to work with Python 1.5.x
diff --git a/client/tools/osad/src/__init__.py b/client/tools/osad/src/__init__.py
index fb3600e..3830a2a 100644
--- a/client/tools/osad/src/__init__.py
+++ b/client/tools/osad/src/__init__.py
@@ -7,9 +7,9 @@
# 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.
+# in this software or its documentation.
#
diff --git a/client/tools/osad/src/dispatcher_client.py \
b/client/tools/osad/src/dispatcher_client.py index 1524039..fbab735 100644
--- a/client/tools/osad/src/dispatcher_client.py
+++ b/client/tools/osad/src/dispatcher_client.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import time
@@ -80,7 +80,7 @@ class Client(jabber_lib.JabberClient):
if actions and action not in actions:
log_debug(1, "action %s not allowed" % action)
return None
-
+
attrs = {
'client-id' : x_client_id,
'timestamp' : x.getAttr('timestamp'),
@@ -139,7 +139,7 @@ class Client(jabber_lib.JabberClient):
# Actions we know how to react to
actions = [
- jabber_lib.NS_RHN_MESSAGE_RESPONSE_CHECKIN,
+ jabber_lib.NS_RHN_MESSAGE_RESPONSE_CHECKIN,
jabber_lib.NS_RHN_MESSAGE_RESPONSE_PING,
]
sig = self._check_signature_from_message(stanza, actions)
@@ -160,7 +160,7 @@ class Client(jabber_lib.JabberClient):
if jid is None:
continue
self.send_message(jid, jabber_lib.NS_RHN_MESSAGE_REQUEST_PING)
-
+
def set_jid_available(self, jid):
jabber_lib.JabberClient.set_jid_available(self, jid)
self._set_state(jid, self._get_push_state_id('online'))
diff --git a/client/tools/osad/src/jabber_lib.py \
b/client/tools/osad/src/jabber_lib.py index 00b6356..b8819f0 100644
--- a/client/tools/osad/src/jabber_lib.py
+++ b/client/tools/osad/src/jabber_lib.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -106,7 +106,7 @@ class Runner:
else:
# Been here before, no need to fork anymore
no_fork=1
-
+
try:
config = self.read_config()
if force_setup:
@@ -137,7 +137,7 @@ class Runner:
continue
except JabberConnectionError:
time_to_sleep = random.randint(self._min_sleep, self._max_sleep)
- log_debug(0, "Unable to connect to jabber servers, sleeping"
+ log_debug(0, "Unable to connect to jabber servers, sleeping"
" %s seconds" % time_to_sleep)
if not self.is_in_background():
self.push_to_background()
@@ -262,7 +262,7 @@ class Runner:
except JabberError, e:
self.print_message(js, "JabberError")
log_error(extract_traceback())
- continue
+ continue
except SSLError, e:
self.print_message(js, "SSLError")
log_error(extract_traceback())
@@ -282,14 +282,14 @@ class Runner:
self.push_to_background()
# Autentication and resource binding
- c.start(username=self._username, password=self._password,
+ c.start(username=self._username, password=self._password,
resource=self._resource)
# Register callbacks
c.custom_handler.register_callback(c._presence_callback, 'presence')
c.custom_handler.register_callback(c._message_callback, 'message')
return c
-
+
def _get_jabber_client(self, jabber_server):
"""Returns a connected Jabber client, or raises an exception if it was
unable to connect"""
@@ -359,7 +359,7 @@ class Handlers:
log_debug(5, stanza)
self.cleanup_expired_callbacks()
-
+
callbacks = self._get_callbacks(stanza)
if not callbacks:
log_debug(4, "Unhandled stanza", stanza)
@@ -406,8 +406,8 @@ class Handlers:
continue
# Update the usage count
ent[2] = usage_count - 1
-
- def register_callback(self, callback, stanza_name, stanza_id=None,
+
+ def register_callback(self, callback, stanza_name, stanza_id=None,
stanza_ns=None, timeout=None, usage_count=None):
log_debug(3, callback, stanza_name, stanza_id, stanza_ns, timeout,
usage_count)
@@ -416,7 +416,7 @@ class Handlers:
else:
expiry = None
callback_entry = [callback, expiry, usage_count]
- h_idns, h_id, h_ns, l_def = self._get_from_hash(self._handlers,
+ h_idns, h_id, h_ns, l_def = self._get_from_hash(self._handlers,
stanza_name, default_value=({}, {}, {}, []))
# h_id is for all the callbacks we should call for a particular stanza
# id; h_ns is for namespaces
@@ -437,7 +437,7 @@ class Handlers:
# Default callback
l_def.append(callback_entry)
-
+
def _get_from_hash(self, h, key, default_value):
if h.has_key(key):
val = h[key]
@@ -470,7 +470,7 @@ class Handlers:
continue
# Callback is stale
vals.remove(val)
-
+
def my_debug(*args):
print "Debugging:", args
@@ -479,7 +479,7 @@ class RestartRequested(Exception):
class JabberError(Exception):
pass
-
+
class NeedRestart(Exception):
pass
@@ -527,7 +527,7 @@ class JabberClient(jabber.Client):
self.debug_level = 0
self.trusted_certs = []
-
+
self.registerProtocol('unknown', JabberProtocolNode)
self.registerProtocol('iq', JabberIqNode)
self.registerProtocol('message', JabberMessageNode)
@@ -545,7 +545,7 @@ class JabberClient(jabber.Client):
self._non_ssl_sock = None
self._roster = Roster()
-
+
self._uniq_client_string = generate_random_string(6)
def add_trusted_cert(self, trusted_cert):
@@ -678,7 +678,7 @@ class JabberClient(jabber.Client):
cert = ssl.get_peer_certificate()
if cert is None:
raise SSLVerifyError("Unable to retrieve peer cert")
-
+
subject = cert.get_subject()
if not hasattr(subject, 'CN'):
raise SSLVerifyError("Certificate has no Common Name")
@@ -692,13 +692,13 @@ class JabberClient(jabber.Client):
hdot = self._host
if hdot[-1] != '.':
hdot = hdot + '.'
-
+
if common_name != hdot and not fnmatch.fnmatchcase(hdot, common_name):
raise SSLVerifyError("Mismatch: peer name: %s; common name: %s" %
(self._host, common_name))
-
+
def retrieve_roster(self):
- """Request the roster. Will register the roster callback,
+ """Request the roster. Will register the roster callback,
but the call will wait for the roster to be properly populated"""
# Register the roster callback
self.custom_handler.register_callback(self._roster_callback, 'iq')
@@ -707,7 +707,7 @@ class JabberClient(jabber.Client):
iq_node.setQuery(jabber.NS_ROSTER)
iq_node.setID(iq_node_id)
self.send(iq_node)
-
+
stanza = None
# Wait for an IQ stanza with the same ID as the one we sent
while 1:
@@ -728,7 +728,7 @@ class JabberClient(jabber.Client):
def _roster_callback(self, client, stanza):
log_debug(3, "Updating the roster", stanza)
-
+
# Extract the <query> node
qnode = stanza.getTag('query')
if qnode is None or qnode.getNamespace() != jabber.NS_ROSTER:
@@ -741,7 +741,7 @@ class JabberClient(jabber.Client):
if node_type not in ('result', 'set'):
log_debug(5, "Not a result or a set, skipping")
return
-
+
# Now extract the <item> nodes
for node in qnode.getTags('item'):
self._roster.add_item(node)
@@ -767,7 +767,7 @@ class JabberClient(jabber.Client):
node.insertNode(qnode)
self.send(node)
-
+
def get_one_stanza(self, timeout=None):
"""Returns one stanza (or None if timeout is set)"""
if timeout:
@@ -784,7 +784,7 @@ class JabberClient(jabber.Client):
tm = None
# No nodes in the queue, read some data
self.process(timeout=tm)
-
+
# Now we have nodes in the queue
node = self._incoming_node_queue[0]
del self._incoming_node_queue[0]
@@ -863,7 +863,7 @@ class JabberClient(jabber.Client):
q.insertTag('resource').insertData(resource)
if auth_ret_query.getTag('token'):
- token = auth_ret_query.getTag('token').getData()
+ token = auth_ret_query.getTag('token').getData()
seq = auth_ret_query.getTag('sequence').getData()
h = hashlib.new('sha1', hashlib.new('sha1', password).hexdigest() + \
token).hexdigest() @@ -886,7 +886,7 @@ class JabberClient(jabber.Client):
log_debug(4, "Need to register")
return self.register(username, password)
raise
-
+
log_debug(4, "Authenticated")
return True
@@ -911,7 +911,7 @@ class JabberClient(jabber.Client):
subscribed -> [ both ]
[ both ]
----------+-------------------+------------------+----------
-
+
Enclosed in square brackets is the state when the communication took
place.
"""
@@ -1022,7 +1022,7 @@ class JabberClient(jabber.Client):
tm = start + timeout - now
else:
tm = None
-
+
# tm is the number of seconds we have to wait (or None)
log_debug(5, "before select(); timeout", tm)
rfds, wfds, exfds = select.select([fileno], [], [], tm)
@@ -1058,7 +1058,7 @@ class JabberClient(jabber.Client):
if not data:
raise JabberError("Premature EOF")
self._parser.Parse(data)
-
+
# We may not have read enough data to be able to produce a node
if not self._incoming_node_queue:
# Go back and read some more
@@ -1070,7 +1070,7 @@ class JabberClient(jabber.Client):
return 0
return len(self._incoming_node_queue)
return 0
-
+
def register(self, username, password):
log_debug(2, username, password)
@@ -1121,7 +1121,7 @@ class JabberClient(jabber.Client):
# get_one_stanza should only return None for a timeout
assert timeout is not None
break
-
+
error_code = stanza.getErrorCode()
if error_code:
# Error
@@ -1134,7 +1134,7 @@ class JabberClient(jabber.Client):
if ID == tid:
# This is the node
return stanza
-
+
# Keep looking for stanzas until we time out (if a timeout was
# passed)
@@ -1153,7 +1153,7 @@ class JabberClient(jabber.Client):
raise JabberQualifiedError(self.lastErrCode, self.lastErr)
raise JabberError("Unknown error", self.lastErr)
-
+
def get_unique_id(self):
seq = self._seq
@@ -1213,12 +1213,12 @@ class JabberClient(jabber.Client):
# case
self.subscribe_to_presence([jid])
return
-
+
if presence_type in ('unsubscribed', 'unavailable'):
- log_debug(4, "Node is unavailable", jid, presence_type)
+ log_debug(4, "Node is unavailable", jid, presence_type)
self.set_jid_unavailable(jid)
return
-
+
if presence_type == 'subscribe':
# XXX misa 20051111: don't check signatures for presence anymore,
# the fact they expire makes them unreliable
@@ -1301,7 +1301,7 @@ class JabberClient(jabber.Client):
log_debug(1, 'Unsupported message type %s ignored' % message_type)
return None
- x_delayed_nodes = self.match_stanza_tags(stanza, 'x',
+ x_delayed_nodes = self.match_stanza_tags(stanza, 'x',
namespace=jabber.NS_DELAY)
if x_delayed_nodes:
log_debug(1, 'Ignoring delayed stanza')
@@ -1341,16 +1341,16 @@ def generate_random_string(length ):
cur_length = cur_length + len(buf)
if cur_length >= length:
break
-
+
devrandom.close()
-
+
result = string.join(result, '')[:length]
return string.lower(result)
def push_to_background():
log_debug(3, "Pushing process into background")
# Push this process into background
- pid = os.fork()
+ pid = os.fork()
if pid > 0:
# Terminate parent process
os._exit(0)
@@ -1361,7 +1361,7 @@ def push_to_background():
# Change working directory
os.chdir('/')
-
+
# Set umask
#7/7/05 wregglej 162619 set the umask to 0 so the remote scripts can run
os.umask(0)
@@ -1369,7 +1369,7 @@ def push_to_background():
#redirect stdin, stdout, and stderr.
for f in sys.stdout, sys.stderr:
f.flush()
-
+
#files we want stdin,stdout and stderr to point to.
si = open("/dev/null", 'r')
so = open("/dev/null", 'a+')
@@ -1466,16 +1466,16 @@ class Roster:
def __repr__(self):
return "Roster:\n\tto: %s\n\tfrom: %s\n\tboth: %s\n\tnone: %s" % (
- self._subscribed_to.keys(),
- self._subscribed_from.keys(),
- self._subscribed_both.keys(),
+ self._subscribed_to.keys(),
+ self._subscribed_from.keys(),
+ self._subscribed_both.keys(),
self._subscribed_none.keys(),
)
def strip_resource(jid):
# One doesn't subscribe to a specific resource
- if not isinstance(jid, jabber.JID):
+ if not isinstance(jid, jabber.JID):
jid = jabber.JID(jid)
return jid.getStripped()
diff --git a/client/tools/osad/src/osa_dispatcher.py \
b/client/tools/osad/src/osa_dispatcher.py index 7009a16..38f43b0 100644
--- a/client/tools/osad/src/osa_dispatcher.py
+++ b/client/tools/osad/src/osa_dispatcher.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import sys
@@ -36,12 +36,12 @@ def main():
class Runner(jabber_lib.Runner):
client_factory = dispatcher_client.Client
-
+
# We want the dispatcher to check in quite often in case the jabberd
# connection drops
_min_sleep = 10
_max_sleep = 10
-
+
def __init__(self):
jabber_lib.Runner.__init__(self)
initCFG("osa-dispatcher")
@@ -150,7 +150,7 @@ class Runner(jabber_lib.Runner):
client_jids = map(lambda x: x[0], client_jids)
# Unsubscribe the dispatcher from any client jid that no longer exists
self.cleanup_roster(c, client_jids)
-
+
c.send_presence()
return c
@@ -172,7 +172,7 @@ class Runner(jabber_lib.Runner):
stripped_jid = str(stripped_jid)
if not active_stripped_jids.has_key(stripped_jid):
to_remove.append(stripped_jid)
-
+
client.cancel_subscription(to_remove)
def process_once(self, client):
@@ -204,7 +204,7 @@ class Runner(jabber_lib.Runner):
self._tcp_server.notify_jabber_nodes()
else:
log_debug(5,"Not notifying jabber nodes")
-
+
_query_reap_pinged_clients = rhnSQL.Statement("""
update rhnPushClient
@@ -249,7 +249,7 @@ class Runner(jabber_lib.Runner):
# XXX Need config option
delta = 20
-
+
client_ids = map(lambda x: x['id'], clients)
deltas = [ delta ] * len(client_ids)
h = rhnSQL.prepare(self._query_update_clients_to_be_pinged)
@@ -266,7 +266,7 @@ class Runner(jabber_lib.Runner):
assert row is not None
self._state_ids[state] = row['id']
return row['id']
-
+
_query_update_register_dispatcher = rhnSQL.Statement("""
update rhnPushDispatcher
@@ -276,7 +276,7 @@ class Runner(jabber_lib.Runner):
where jabber_id = :jabber_id_in
""")
_query_insert_register_dispatcher = rhnSQL.Statement("""
- insert into rhnPushDispatcher
+ insert into rhnPushDispatcher
(id, jabber_id, last_checkin, hostname, port, password)
values (sequence_nextval('rhn_pushdispatch_id_seq'), :jabber_id_in, \
current_timestamp, :hostname_in, :port_in, :password_in)
@@ -307,13 +307,13 @@ class Runner(jabber_lib.Runner):
# clients that just checked in
ret.append((row['jabber_id'], row['modified']))
return ret
-
+
class UpstreamServer(SocketServer.TCPServer):
def __init__(self, server_address):
SocketServer.TCPServer.__init__(self, server_address, None)
self._next_poll_interval = None
-
+
def get_server_port(self):
return self.server_address[1]
@@ -350,16 +350,16 @@ class UpstreamServer(SocketServer.TCPServer):
self._next_poll_interval = min(delta, npi)
log_debug(4, "Next poll interval", delta)
continue
-
+
jabber_id = row['jabber_id']
if jabber_id is None:
# Not even online
continue
-
+
if not self.jabber_connection.jid_available(jabber_id):
log_debug(4, "Node %s not available for notifications" %
jabber_id)
- # iterate further, in case there are other clients that
+ # iterate further, in case there are other clients that
# CAN be notified.
continue
diff --git a/client/tools/osad/src/osad.py b/client/tools/osad/src/osad.py
index 9255696..ef2af94 100644
--- a/client/tools/osad/src/osad.py
+++ b/client/tools/osad/src/osad.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import re
@@ -85,7 +85,7 @@ class Runner(jabber_lib.Runner):
logfile = self.options.logfile
if logfile is None or logfile == '':
logfile = config['logfile']
-
+
debug_level = self.options.verbose
if debug_level is None:
dl = config['debug_level']
@@ -122,7 +122,7 @@ class Runner(jabber_lib.Runner):
self._jabber_servers = []
if self.options.jabber_server:
self._jabber_servers.append(self.options.jabber_server)
-
+
if type(server_url) == type([]):
for su in server_url:
a_su = self._parse_url(su)[1]
@@ -131,10 +131,10 @@ class Runner(jabber_lib.Runner):
upstream_jabber_server = self._parse_url(server_url)[1]
if upstream_jabber_server not in self._jabber_servers:
self._jabber_servers.append(upstream_jabber_server)
-
+
if type(server_url) != type([]):
server_url = [server_url]
-
+
for su in server_url:
try:
params['uri'] = su
@@ -142,14 +142,14 @@ class Runner(jabber_lib.Runner):
if osa_ssl_cert:
s.add_trusted_cert(osa_ssl_cert)
s.registration.welcome_message()
-
+
server_capabilities = get_server_capability(s)
if not server_capabilities.has_key('registration.register_osad'):
die("Server does not support OSAD registration")
-
+
self._systemid_file = systemid_file = config['systemid']
self._systemid = systemid = open(systemid_file).read()
-
+
current_timestamp = int(time.time())
ret = s.registration.register_osad(systemid, {'client-timestamp' :
current_timestamp})
@@ -158,12 +158,12 @@ class Runner(jabber_lib.Runner):
continue
else: #for
ret = {}
-
+
#Bugzilla: 142067
#If the server doesn't have push support. 'ret' won't have anything in it.
if len(ret.keys()) < 1:
raise jabber_lib.JabberConnectionError
-
+
server_timestamp = ret.get('server-timestamp')
# Compute the time drift between the client and the server
self._time_drift = server_timestamp - current_timestamp
@@ -185,7 +185,7 @@ class Runner(jabber_lib.Runner):
self._shared_key = ret.get('shared-key')
log_debug(2, "Client name", self._client_name)
log_debug(2, "Shared key", self._shared_key)
-
+
# Load the config
self._config_options.clear()
self._config_options.update(config)
@@ -197,7 +197,7 @@ class Runner(jabber_lib.Runner):
# 'client_name' : self._client_name,
# 'shared_key' : self._shared_key,
})
-
+
def _parse_url(self, url, scheme="http"):
import urlparse
@@ -207,7 +207,7 @@ class Runner(jabber_lib.Runner):
url = scheme + "://" + url
sch, netloc, path, params, query, fragment = urlparse.urlparse(url)
return sch, netloc, path, params, query, fragment
-
+
def fix_connection(self, c):
"After setting up the connection, do whatever else is necessary"
c.set_config_options(self._config_options)
@@ -234,7 +234,7 @@ class Runner(jabber_lib.Runner):
return c
def process_once(self, client):
-
+
# Re-read the systemid file. If it's changed from the
# previous version re-setup the config. This will create a new
# key on the satellite server tied to this new system id.
@@ -245,7 +245,7 @@ class Runner(jabber_lib.Runner):
log_debug(4, "System re-registration detected. systemid file has \
changed.") config = self.read_config()
raise jabber_lib.NeedRestart
-
+
client.process(timeout0)
def read_config(self):
@@ -253,7 +253,7 @@ class Runner(jabber_lib.Runner):
# Read from the global config first
config_file = self.options.cfg
self._config = osad_config.init('osad', config_file=config_file)
- config_keys = ['debug_level', 'osa_ssl_cert', 'logfile', 'run_rhn_check',
+ config_keys = ['debug_level', 'osa_ssl_cert', 'logfile', 'run_rhn_check',
'rhn_check_command', 'enable_failover']
for key in config_keys:
ret[key] = osad_config.get(key)
@@ -267,7 +267,7 @@ class Runner(jabber_lib.Runner):
server_url = config.getServerlURL()[0]
ret['server_url'] = server_url
-
+
#8/23/05 wregglej 165775 added the run_rhn_check option.
run_rhn_check = osad_config.get('run_rhn_check')
if run_rhn_check is None:
@@ -291,7 +291,7 @@ class Runner(jabber_lib.Runner):
ret['enable_proxy'] = 1
ret['proxy_url'] = config.getProxySetting()
-
+
enable_proxy_auth = self._config.get_option('enableProxyAuth')
if enable_proxy_auth is None:
enable_proxy_auth = self.get_up2date_config()['enableProxyAuth']
@@ -331,12 +331,12 @@ class Runner(jabber_lib.Runner):
ret['osa_ssl_cert'] = osa_ssl_cert
return ret
-
+
def get_up2date_config(self):
if self._up2date_config is None:
self._up2date_config = initUp2dateConfig()
return self._up2date_config
-
+
def build_rpclib_params(self, config):
ret = {}
kmap = {
diff --git a/client/tools/osad/src/osad_client.py \
b/client/tools/osad/src/osad_client.py index 390a42b..9a3a965 100644
--- a/client/tools/osad/src/osad_client.py
+++ b/client/tools/osad/src/osad_client.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -31,7 +31,7 @@ class Client(jabber_lib.JabberClient):
self.time_drift = 0
self._dispatchers = []
self._config = {}
-
+
def set_config_options(self, config):
self._config = config
@@ -123,7 +123,7 @@ class Client(jabber_lib.JabberClient):
abs_drift = abs(current_drift - self.time_drift)
if abs_drift > max_drift:
log_debug(1, "Dropping message, drift is too big", abs_drift)
-
+
action = x.getAttr('action')
if actions and action not in actions:
@@ -135,7 +135,7 @@ class Client(jabber_lib.JabberClient):
if not full_jid:
log_debug(3, "Full JID not found in signature stanza")
return None
-
+
attrs = {
'timestamp' : x.getAttr('timestamp'),
'serial' : x.getAttr('serial'),
@@ -162,7 +162,7 @@ class Client(jabber_lib.JabberClient):
# Actions we know how to react to
actions = [
- jabber_lib.NS_RHN_MESSAGE_REQUEST_CHECKIN,
+ jabber_lib.NS_RHN_MESSAGE_REQUEST_CHECKIN,
jabber_lib.NS_RHN_MESSAGE_REQUEST_PING,
]
sig = self._check_signature_from_message(stanza, actions)
@@ -177,9 +177,9 @@ class Client(jabber_lib.JabberClient):
return
# Send confirmation
- self.send_message(stanza.getFrom(),
+ self.send_message(stanza.getFrom(),
jabber_lib.NS_RHN_MESSAGE_RESPONSE_CHECKIN)
-
+
command = self._config.get('rhn_check_command')
# rhn_check now checks for multiple instances,
# lets use that directly
@@ -190,11 +190,11 @@ class Client(jabber_lib.JabberClient):
args = string.split(command)
log_debug(3, "About to execute:", args)
-
+
# Checkin
run_check = self._config.get('run_rhn_check')
log_debug(3, "run_rhn_check:", run_check)
-
+
if not self._config.get('run_rhn_check'):
log_debug(0, "Pretend that rhn_check just ran")
else:
diff --git a/client/tools/osad/src/osad_config.py \
b/client/tools/osad/src/osad_config.py index 15462fb..c411c50 100644
--- a/client/tools/osad/src/osad_config.py
+++ b/client/tools/osad/src/osad_config.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -22,7 +22,7 @@ else:
# Python 1.5.2 - use the internal copy
import _ConfigParser
ConfigParser = _ConfigParser
-
+
InterpolationError = ConfigParser.InterpolationError
class ClientConfigParser(ConfigParser.ConfigParser):
@@ -42,7 +42,7 @@ class ClientConfigParser(ConfigParser.ConfigParser):
try:
self.read(self._get_config_files())
except ConfigParser.MissingSectionHeaderError, e:
- print "Config error: line %s, file %s: %s" % (e.lineno,
+ print "Config error: line %s, file %s: %s" % (e.lineno,
e.filename, e)
sys.exit(1)
@@ -54,11 +54,11 @@ class ClientConfigParser(ConfigParser.ConfigParser):
def get_option(self, option, defval=None):
try:
return self.get(self.section, option, vars=self.overrides)
- except (ConfigParser.NoOptionError, ConfigParser.NoSectionError), e:
+ except (ConfigParser.NoOptionError, ConfigParser.NoSectionError), e:
pass
defaults = self.defaults()
-
+
if defaults.has_key(option):
return defaults[option]
@@ -83,7 +83,7 @@ def init(section, defaults=None, config_file=None, **overrides):
cp._global_config_file = config_file
cp.read_config_files(overrides)
return cp
-
+
def get(var, defval=None):
return _get_config().get_option(var, defvalÞfval)
@@ -112,7 +112,7 @@ def get_auth_info(auth_file, section, force, **defaults):
c.set(section, k, v)
_modified = 1
if _modified:
- fd = os.open(c._global_config_file,
+ fd = os.open(c._global_config_file,
os.O_CREAT | os.O_TRUNC | os.O_WRONLY, 0600)
f = os.fdopen(fd, "w")
f.write("# Automatically generated. Do not edit!\n\n")
diff --git a/client/tools/osad/src/rhn_log.py b/client/tools/osad/src/rhn_log.py
index 3607c1a..e189afc 100644
--- a/client/tools/osad/src/rhn_log.py
+++ b/client/tools/osad/src/rhn_log.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -24,7 +24,7 @@ class Logger:
logfile = "/var/log/osad"
def set_logfile( self, logfile ):
- Logger.logfile = logfile
+ Logger.logfile = logfile
def log_debug(self, debug_level, *args):
if debug_level <= self.debug_level:
@@ -33,7 +33,7 @@ class Logger:
self.get_caller(),
string.join(map(str, args))
)
-
+
outstring = "%s %s: %s\n" % info_out
sys.stdout.write( outstring )
@@ -43,7 +43,7 @@ class Logger:
os.write(fd, outstring)
os.close(fd)
except IOError:
- raise
+ raise
def set_debug_level(self, debug_level):
Logger.debug_level = debug_level
diff --git a/client/tools/osad/test/simple-client.py \
b/client/tools/osad/test/simple-client.py index a29ed21..fe37501 100644
--- a/client/tools/osad/test/simple-client.py
+++ b/client/tools/osad/test/simple-client.py
@@ -7,17 +7,17 @@
# 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.
+# in this software or its documentation.
#
import sys
import jabber_lib
import test_lib
-
+
class SimpleClientClient(test_lib.SimpleClient):
pass
diff --git a/client/tools/osad/test/simple-dispatcher.py \
b/client/tools/osad/test/simple-dispatcher.py index 58632b1..d461644 100644
--- a/client/tools/osad/test/simple-dispatcher.py
+++ b/client/tools/osad/test/simple-dispatcher.py
@@ -7,16 +7,16 @@
# 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.
+# in this software or its documentation.
#
import sys
import test_lib
-
+
class SimpleDispatcherClient(test_lib.SimpleClient):
pass
diff --git a/client/tools/osad/test/test_lib.py b/client/tools/osad/test/test_lib.py
index bd30c1f..41bff33 100644
--- a/client/tools/osad/test/test_lib.py
+++ b/client/tools/osad/test/test_lib.py
@@ -7,17 +7,17 @@
# 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.
+# in this software or its documentation.
#
import sys
import jabber_lib
import time
import rhn_log
-
+
class SimpleClient(jabber_lib.JabberClient):
def start(self, username, password, resource):
t0 = time.time()
@@ -64,7 +64,7 @@ class SimpleRunner(jabber_lib.Runner):
def read_config(self):
return {
'logfile' : self.log_file,
- }
+ }
def setup_config(self, config):
self.options.nodetach = 1
@@ -92,6 +92,6 @@ class SimpleRunner(jabber_lib.Runner):
self.ssl_cert = self.options.trusted_cert
self._jabber_servers.extend(self.options.jabberd)
-
+
def process_once(self, client):
client.process(timeout=None)
diff --git a/client/tools/rhn-kickstart/actions/kickstart.py \
b/client/tools/rhn-kickstart/actions/kickstart.py index e0825e5..abd900a 100644
--- a/client/tools/rhn-kickstart/actions/kickstart.py
+++ b/client/tools/rhn-kickstart/actions/kickstart.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import sys
diff --git a/client/tools/rhn-kickstart/actions/kickstart_guest.py \
b/client/tools/rhn-kickstart/actions/kickstart_guest.py index e2149e0..1cc42de 100644
--- a/client/tools/rhn-kickstart/actions/kickstart_guest.py
+++ b/client/tools/rhn-kickstart/actions/kickstart_guest.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
@@ -48,7 +48,7 @@ def initiate(ks_session_id, name, mem_kb, vcpus, disk_gb, \
extra_append, cache_on log_notify_handler = KickstartLogNotifyHandler(ks_session_id)
try:
- kickstart_guest.initiate_guest(name, mem_kb, vcpus, disk_gb,
+ kickstart_guest.initiate_guest(name, mem_kb, vcpus, disk_gb,
extra_append, log_notify_handler)
except VirtualizationKickstartException, ke:
error_code = 1
@@ -64,7 +64,7 @@ def initiate(ks_session_id, name, mem_kb, vcpus, disk_gb, \
extra_append, cache_on \
###############################################################################
class KickstartLogNotifyHandler(BatchNotifyHandler):
-
+
def __init__(self, ks_session_id):
self.__ks_session_id = ks_session_id
self.__plan = None
diff --git a/client/tools/rhn-kickstart/rhnkickstart/__init__.py \
b/client/tools/rhn-kickstart/rhnkickstart/__init__.py index fb3600e..3830a2a 100644
--- a/client/tools/rhn-kickstart/rhnkickstart/__init__.py
+++ b/client/tools/rhn-kickstart/rhnkickstart/__init__.py
@@ -7,9 +7,9 @@
# 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.
+# in this software or its documentation.
#
diff --git a/client/tools/rhn-kickstart/rhnkickstart/common.py \
b/client/tools/rhn-kickstart/rhnkickstart/common.py index 5e2ecc9..dea57fa 100644
--- a/client/tools/rhn-kickstart/rhnkickstart/common.py
+++ b/client/tools/rhn-kickstart/rhnkickstart/common.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -26,8 +26,8 @@ from rhnkickstart.kickstart_exceptions import \
def download_install_images(kickstart_config, remote_path, local_path):
# Dig out the URL for the kernel image and ramdisk.
ks_tree_url = _extract_ks_tree_from_config(kickstart_config)
-
- # Now download the kernel and ramdisk files. We'll store them in
+
+ # Now download the kernel and ramdisk files. We'll store them in
# temporary files.
(kernel_path, initrd_path) = _download_install_images(ks_tree_url,
remote_path, local_path)
@@ -51,9 +51,9 @@ def extract_kickstart_url(extra_append):
def download_kickstart_file(extra_append):
- """
+ """
Download the kickstart config file.
-
+
Read the location from the kernel parameters found in extra_append.
Return a string containing the contents of the config file.
"""
@@ -65,7 +65,7 @@ def download_kickstart_file(extra_append):
raise KickstartDownloadException, \
"Error downloading kickstart file from '%s': %s" % \
(ks_url, str(e)), sys.exc_info()[2]
-
+
# Sanity check to make sure we actually received a kickstart file.
_ensure_valid_kickstart_file(ks_url, ks_data)
@@ -83,8 +83,8 @@ def _ensure_valid_kickstart_file(ks_url, ks_data):
(ks_url)
def _extract_ks_tree_from_config(kickstart_config):
- tree_url_match = re.search("url --url (\S+)",
- kickstart_config,
+ tree_url_match = re.search("url --url (\S+)",
+ kickstart_config,
re.MULTILINE)
if not tree_url_match:
raise MalformedKickstartFileException, \
diff --git a/client/tools/rhn-kickstart/rhnkickstart/config.py \
b/client/tools/rhn-kickstart/rhnkickstart/config.py index 5c4a0a0..bf794cb 100644
--- a/client/tools/rhn-kickstart/rhnkickstart/config.py
+++ b/client/tools/rhn-kickstart/rhnkickstart/config.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
#
# Configuration option for RHN kickstart functionality.
diff --git a/client/tools/rhn-kickstart/rhnkickstart/kickstart.py \
b/client/tools/rhn-kickstart/rhnkickstart/kickstart.py index 17a68d6..3f968a0 100644
--- a/client/tools/rhn-kickstart/rhnkickstart/kickstart.py
+++ b/client/tools/rhn-kickstart/rhnkickstart/kickstart.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
#
# Useful kickstart functions
@@ -41,7 +41,7 @@ YABOOT_CONF = "/etc/yaboot.conf"
ZIPL_CONF = "/etc/zipl.conf"
def initiate(base, extra_append, static_device=None, preserve_files=[]):
- # XXX it's bad to hardcode each special case, but this is the only one I
+ # XXX it's bad to hardcode each special case, but this is the only one I
# can think of...
if os.path.exists(ELILO_BOOT):
base_dir = os.path.join(PREFIX, ELILO_BOOT, RHN_KS_DIR, base)
@@ -74,7 +74,7 @@ def initiate(base, extra_append, static_device=None, \
preserve_files=[]): # cleanup previous attempt
rm_rf(SHADOW)
os.mkdir(SHADOW)
-
+
if static_device:
extra_append, error = local_network_kickstart(extra_append,
kickstart_config, static_device, initrd, preserve_files)
@@ -87,9 +87,9 @@ def initiate(base, extra_append, static_device=None, \
preserve_files=[]): # Error
return ret
initrd = initrd + ".merged"
-
+
# XXX hardcoding the ramdisk_size is potentially bad, and
- # should be dynamic based on the size of the uncompressed new initrd
+ # should be dynamic based on the size of the uncompressed new initrd
if os.path.exists(ZIPL_CONF):
append = ["ip=off", "root=/dev/ram0", "ramdisk_size@000", "ro", "RUNKS=1"]
else:
@@ -104,10 +104,10 @@ def initiate(base, extra_append, static_device=None, \
preserve_files=[]):
if os.path.exists(GRUB_CONF):
# the boolean logic marks success to '1' if function call suceeds
- success = _modify_grub_conf(base, kernel, initrd, append, error_messages) or \
success + success = _modify_grub_conf(base, kernel, initrd, append, \
error_messages) or success
if os.path.exists(LILO_CONF):
- success = _modify_lilo_conf(base, kernel, initrd, append, error_messages) or \
success + success = _modify_lilo_conf(base, kernel, initrd, append, \
error_messages) or success
if os.path.exists(YABOOT_CONF):
success = _modify_yaboot_conf(base, kernel, initrd, append, error_messages) \
or success @@ -119,7 +119,7 @@ def initiate(base, extra_append, static_device=None, \
preserve_files=[]):
success = _modify_s390(base, kernel, initrd, append, error_messages) or \
success
if not success:
- return (10, "Kickstart initiate failed: failed to install bootloaders",
+ return (10, "Kickstart initiate failed: failed to install bootloaders",
error_messages)
return (0, "Kickstart initiate succeeded", error_messages)
@@ -158,13 +158,13 @@ def _modify_lilo_conf(base, vmlinuz, initrd, append, \
error_messages): modify the configuration file for the lilo bootloader
returns '1' on success, '0' on failure
"""
-
+
label = "kickstart"
add_to_lilo(label=label, vmlinuz=vmlinuz, initrd=initrd, append=append, \
lilo_conf=LILO_CONF) bootloader_args = [
- "/sbin/lilo",
- "-C", LILO_CONF,
+ "/sbin/lilo",
+ "-C", LILO_CONF,
]
exit_code, stdout, stderr = my_popen(bootloader_args)
if exit_code:
@@ -217,9 +217,9 @@ def _modify_elilo_conf(base, vmlinuz, initrd, append, \
error_messages): # XXX ugly hack to work around required relative path for elilo
e_vmlinuz = string.replace(vmlinuz, '/boot/efi', '../..', 1)
e_initrd = string.replace(initrd, '/boot/efi', '../..', 1)
-
+
# this works for elilo as well: for rhel2.1
- # XXX the problem with this approach is that there is *no* error checking,
+ # XXX the problem with this approach is that there is *no* error checking,
# so we won't know about a failure until it's too late
label = "kickstart"
add_to_lilo(label=label, vmlinuz=e_vmlinuz, initrd=e_initrd, append=append, \
lilo_conf=ELILO_CONF) @@ -251,7 +251,7 @@ def _modify_s390(base, vmlinuz, initrd, \
append, error_messages):
# Buid parm file from kernel parameters in append.
# There is a maximum of 32 parameters.
- parmfn = os.path.join(PREFIX, BOOT, RHN_KS_DIR, "user.parm")
+ parmfn = os.path.join(PREFIX, BOOT, RHN_KS_DIR, "user.parm")
if os.path.exists(parmfn):
os.unlink(parmfn)
parmfd = os.open(parmfn, os.O_CREAT | os.O_WRONLY)
@@ -445,7 +445,7 @@ def local_network_kickstart(extra_append, ks_data, static_device, \
initrd, preser
if not os.access(SHADOW, os.F_OK):
os.mkdir(SHADOW, 0700)
-
+
ks_file = SHADOW + "/" + "ks.cfg"
f = open(ks_file, "w")
f.write(ks_data)
@@ -458,20 +458,20 @@ def local_network_kickstart(extra_append, ks_data, \
static_device, initrd, preser if status:
return None, (15, "Unable to create network kickstart",
_build_error(status, stdout, stderr))
-
+
ret = create_new_rd(initrd, preserve_files)
if ret:
# Error
return None, ret
-
+
extra_append = "%s%s%s" % (extra_append[:match.start(1)], "ks=file:/ks.cfg", \
extra_append[match.end(1):])
-
+
return extra_append, None
def create_new_rd(initrd, preserve_files=[]):
"""
- Returns None if everything went well, or a tuple
+ Returns None if everything went well, or a tuple
(err_code, err_string, dict) if problems were found
"""
if not initrd:
@@ -484,9 +484,9 @@ def create_new_rd(initrd, preserve_files=[]):
# lame naming below to use /tmp/ks-tres-shadow 2X
# but needed to get it here the ks.cfg expects it
preserve_shadow = SHADOW + SHADOW
- # new FileCopier class handles the dirty work of getting the
+ # new FileCopier class handles the dirty work of getting the
# preserved file set copied w/ all permissions, owners, etc
- # kept intact and in the correct location
+ # kept intact and in the correct location
c = FileCopier(preserve_files, preserve_shadow, quota=quota)
try:
c.copy()
@@ -520,7 +520,7 @@ def _remove_func(path):
# Attempt to remove the file/link/etc
os.unlink(path)
return
-
+
# It's a directory!
files = os.listdir(path)
# We need to add the path since listdir only returns a relative path
@@ -540,7 +540,7 @@ def _build_error(status, stdout, stderr):
'stderr' : stderr.read(),
}
return params
-
+
class QuotaExceeded(Exception):
@@ -601,7 +601,7 @@ class FileCopier:
# Quota enabled
if self.current_quota + file_size > self.quota:
raise QuotaExceeded(f)
-
+
def _update_quota(self, f, file_size):
self.current_quota = self.current_quota + file_size
@@ -616,7 +616,7 @@ class FileCopier:
os.chmod(dest, st[stat.ST_MODE])
os.chown(dest, st[stat.ST_UID], st[stat.ST_GID])
os.utime(dest, (st[stat.ST_ATIME], st[stat.ST_MTIME]))
-
+
def _copy_dir(self, f, st):
files = map(lambda x, d=f: os.path.join(d, x), os.listdir(f))
@@ -660,7 +660,7 @@ class FileCopier:
for d in l:
src_dir = os.path.join(src_dir, d)
src_st = os.lstat(src_dir)
- dest_dir = os.path.join(dest_dir, d)
+ dest_dir = os.path.join(dest_dir, d)
if not os.path.exists(dest_dir):
os.mkdir(dest_dir)
os.chmod(dest_dir, src_st[stat.ST_MODE])
diff --git a/client/tools/rhn-kickstart/rhnkickstart/kickstart_exceptions.py \
b/client/tools/rhn-kickstart/rhnkickstart/kickstart_exceptions.py index \
8fb1dad..19db3e1 100644
--- a/client/tools/rhn-kickstart/rhnkickstart/kickstart_exceptions.py
+++ b/client/tools/rhn-kickstart/rhnkickstart/kickstart_exceptions.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
#
# Kickstart-related exceptions.
@@ -27,7 +27,7 @@ class KickstartDownloadException(KickstartException):
"""Error occurred while downloading the kickstart configuration."""
pass
-class MalformedKickstartURLException(KickstartException):
+class MalformedKickstartURLException(KickstartException):
"""Couldn't parse the kickstart URL."""
pass
diff --git a/client/tools/rhn-kickstart/rhnkickstart/kickstart_guest.py \
b/client/tools/rhn-kickstart/rhnkickstart/kickstart_guest.py index ee8c83b..3f2b18b \
100644
--- a/client/tools/rhn-kickstart/rhnkickstart/kickstart_guest.py
+++ b/client/tools/rhn-kickstart/rhnkickstart/kickstart_guest.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
#
# Kickstart functions for Xen guests.
@@ -101,12 +101,12 @@ XEN_CREATE_TEMPLATE = """
# Public interface
###############################################################################
-def initiate_guest(name, mem_kb, vcpus, disk_gb, extra_append,
+def initiate_guest(name, mem_kb, vcpus, disk_gb, extra_append,
log_notify_handler=None):
files_to_cleanup = []
- # We'll wrap this up in a try block so that we can clean up should an
+ # We'll wrap this up in a try block so that we can clean up should an
# exception occur.
try:
# First, download the kickstart file.
@@ -118,7 +118,7 @@ def initiate_guest(name, mem_kb, vcpus, disk_gb, extra_append,
# are served a 404. We'll remove this hack when we figure out what the
# server-side issue is.
time.sleep(5)
-
+
# Download the kernel and initrd images.
(install_kernel_path, install_initrd_path) = \
common.download_install_images(kickstart_config, "images/xen",
@@ -129,13 +129,13 @@ def initiate_guest(name, mem_kb, vcpus, disk_gb, extra_append,
# Create the disk image for the instance.
disk_image_path = _create_disk_image(name, disk_gb)
files_to_cleanup.append(disk_image_path)
-
- # Determine the type of disk image.
+
+ # Determine the type of disk image.
disk_image_type = _determine_disk_image_type(disk_image_path)
-
+
# Generate a UUID for this new instance.
uuid = _generate_uuid()
-
+
# Generate a MAC address for this new instance.
if DEBUG:
mac = DEBUG_MAC_ADDRESS
@@ -145,18 +145,18 @@ def initiate_guest(name, mem_kb, vcpus, disk_gb, extra_append,
# Connect to the hypervisor.
connection = _connect_to_hypervisor()
- # Now we have enough information to actually create and install the
+ # Now we have enough information to actually create and install the
# domain.
domain = _begin_domain_installation( \
connection,
- name = name,
- install_kernel_path = install_kernel_path,
- install_initrd_path = install_initrd_path,
- extra_append = extra_append,
- mem_kb = mem_kb,
- vcpus = vcpus,
- uuid = uuid,
- disk_image_path = disk_image_path,
+ name = name,
+ install_kernel_path = install_kernel_path,
+ install_initrd_path = install_initrd_path,
+ extra_append = extra_append,
+ mem_kb = mem_kb,
+ vcpus = vcpus,
+ uuid = uuid,
+ disk_image_path = disk_image_path,
disk_image_type = disk_image_type,
mac = mac)
@@ -171,16 +171,16 @@ def initiate_guest(name, mem_kb, vcpus, disk_gb, extra_append,
name = name,
mem_kb = mem_kb,
vcpus = vcpus,
- uuid = uuid,
- disk_image_path = disk_image_path,
- disk_image_type = disk_image_type,
+ uuid = uuid,
+ disk_image_path = disk_image_path,
+ disk_image_type = disk_image_type,
mac = mac)
files_to_cleanup.append(config_file_path)
# Restart the domain with the new configuration.
_boot_domain(uuid)
- # The domain is now started. Finally, refresh the current
+ # The domain is now started. Finally, refresh the current
# virtualization state on the server.
# VCPUs get plugged in one at a time, querying the hypervisor state
@@ -198,7 +198,7 @@ def initiate_guest(name, mem_kb, vcpus, disk_gb, extra_append,
files_to_cleanup.append(install_initrd_path)
finally:
- # If something went wrong, the logic will bounce out here before
+ # If something went wrong, the logic will bounce out here before
# returning to the caller. We'll use this opportunity to clean up
# any files that we might have created so far. It would be quite rude
# to leave multi-GB sized files laying around.
@@ -227,11 +227,11 @@ def _generate_uuid():
def _generate_mac_address():
"""Generate a random MAC address and return it."""
- mac_list = [ 0x00,
- 0x16,
- 0x3e,
- random.randint(0x00, 0x7f),
- random.randint(0x00, 0xff),
+ mac_list = [ 0x00,
+ 0x16,
+ 0x3e,
+ random.randint(0x00, 0x7f),
+ random.randint(0x00, 0xff),
random.randint(0x00, 0xff) ]
return ":".join(map(lambda x: "%02x" % x, mac_list))
@@ -247,7 +247,7 @@ def _create_disk_image(guest_name, img_size_gb, base_dir = \
XEN_DISK_IMAGE_DIR): except Exception, e:
raise DiskImageCreationException, \
"Could not create %s: %s" % (base_dir, str(e)), sys.exc_info()[2]
-
+
# Construct the path of the disk image.
image_path = os.path.join(base_dir, "%s.disk" % guest_name)
@@ -297,14 +297,14 @@ def _connect_to_hypervisor():
return connection
def _begin_domain_installation(connection,
- name,
- install_kernel_path,
- install_initrd_path,
- extra_append,
- mem_kb,
- vcpus,
- uuid,
- disk_image_path,
+ name,
+ install_kernel_path,
+ install_initrd_path,
+ extra_append,
+ mem_kb,
+ vcpus,
+ uuid,
+ disk_image_path,
disk_image_type,
mac):
"""
@@ -338,7 +338,7 @@ def _begin_domain_installation(connection,
"Error occurred while attempting to create domain %s: %s" % \
(name, str(e)), sys.exc_info()[2]
- # Wait a bit for the instance to start and then ensure that the domain is
+ # Wait a bit for the instance to start and then ensure that the domain is
# still around. If it isn't we will assume that it crashed.
time.sleep(5)
try:
@@ -356,8 +356,8 @@ def _wait_for_domain_installation_completion(conn, domain):
appear in the list of running domains. At this time we assume the guest
kickstart is underway.
- Next we monitor that list of running domain IDs until the one we're
- interested in is no longer present. At this time we assume the guest
+ Next we monitor that list of running domain IDs until the one we're
+ interested in is no longer present. At this time we assume the guest
kickstart has terminated successfully.
"""
@@ -399,7 +399,7 @@ def _check_guest_mbr(diskPath):
Checks the guests disk path for a master boot record that would seem to
indicate success.
- This code was taken from the python-virtinst package in
+ This code was taken from the python-virtinst package in
/usr/sbin/virt-install.
"""
@@ -409,7 +409,7 @@ def _check_guest_mbr(diskPath):
os.close(fd)
if len(buf) == 512 and \
struct.unpack("H", buf[0x1fe: 0x200]) == (0xaa55,):
- return
+ return
else:
# This looks like a failed install, but it's not certain:
raise VirtualizationKickstartException, \
@@ -420,12 +420,12 @@ def _check_guest_mbr(diskPath):
"Error checking for guest disk MBR, install may have failed: %s" % \
diskPath, sys.exc_info()[2]
-def _create_boot_config_file(name,
- mem_kb,
- vcpus,
- uuid,
- disk_image_path,
- disk_image_type,
+def _create_boot_config_file(name,
+ mem_kb,
+ vcpus,
+ uuid,
+ disk_image_path,
+ disk_image_type,
mac):
"""
Writes reboot-specific XML out to a config file in our directory.
@@ -437,11 +437,11 @@ def _create_boot_config_file(name,
# Now write the XML blob out to a file so it can be reused later.
domain_dir = DomainDirectory()
try:
- domain_dir.create_standard_config(uuid,
- name,
- mem_kb,
- vcpus,
- disk_image_path,
+ domain_dir.create_standard_config(uuid,
+ name,
+ mem_kb,
+ vcpus,
+ disk_image_path,
mac)
except Exception, e:
raise VirtualizationKickstartException, \
@@ -468,18 +468,18 @@ def _boot_domain(uuid):
def syslog_listener(host, port, log_notify_handler):
"""
syslog listener to grab the anaconda output
- """
+ """
log_notifier = BatchingLogNotifier(log_notify_handler)
log_notifier.start()
- # Caution the user
+ # Caution the user
log_notifier.add_log_message("RHN:: If your guest firewall is enabled, " \
"some parts of the installation process might not be logged")
-
+
# socket to listen to syslog
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
try:
- s.bind((host, int(port)))
+ s.bind((host, int(port)))
except socket.error:
s.close()
log_notifier.add_log_message("RHN:: Port %s already in use" % port)
@@ -489,16 +489,16 @@ def syslog_listener(host, port, log_notify_handler):
try:
# receive installation log from syslog
while 1:
- chunk = s.recv(1024)
+ chunk = s.recv(1024)
if not chunk:
break
chunk = chunk + " \n"
- log_notifier.add_log_message(chunk)
+ log_notifier.add_log_message(chunk)
s.close()
finally:
# Always make sure we stop the log notifier thread.
log_notifier.stop()
- return
+ return
# Test routine
if __name__ == "__main__":
diff --git a/client/tools/rhn-kickstart/rhnkickstart/lilo.py \
b/client/tools/rhn-kickstart/rhnkickstart/lilo.py index 46024d7..63c48e1 100644
--- a/client/tools/rhn-kickstart/rhnkickstart/lilo.py
+++ b/client/tools/rhn-kickstart/rhnkickstart/lilo.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
"""Module for manipulation of lilo.conf files."""
@@ -92,7 +92,7 @@ class LiloConfigFile:
s = s + '\n'
for count in range(len(self.diskRemaps)):
s = s + "disk = %s\n" % self.diskRemaps[count][1]
- s = s + "\tbios = %s\n" % self.biosRemaps[count][1]
+ s = s + "\tbios = %s\n" % self.biosRemaps[count][1]
for cl in self.images:
s = s + "\n%s=%s\n" % (cl.imageType, cl.path)
s = s + cl.__repr__(1)
@@ -140,8 +140,8 @@ class LiloConfigFile:
if config.getEntry('alias'):
if string.lower(config.getEntry('alias')) == string.lower(label):
return (config.imageType, config,config.path,config.other)
-
-
+
+
raise IndexError, "unknown image %s" % (label)
def addImage (self, config,first=None):
@@ -204,7 +204,7 @@ class LiloConfigFile:
f1 = string.strip (fields [1])
if (f0 == "image" or f0 == "other"):
if image: self.addImage(image)
- image = LiloConfigFile(imageType = f0,
+ image = LiloConfigFile(imageType = f0,
path = f1)
if (f0 == "other"):
image.other = 1
@@ -227,7 +227,7 @@ class LiloConfigFile:
apply(self.addEntry, args)
if image: self.addImage(image)
-
+
f.close()
def __init__(self, imageType = None, path = None):
diff --git a/client/tools/rhn-kickstart/rhnkickstart/virtualization_kickstart_exceptions.py \
b/client/tools/rhn-kickstart/rhnkickstart/virtualization_kickstart_exceptions.py \
index 9a717f3..7427046 100644
--- a/client/tools/rhn-kickstart/rhnkickstart/virtualization_kickstart_exceptions.py
+++ b/client/tools/rhn-kickstart/rhnkickstart/virtualization_kickstart_exceptions.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
#
# Kickstart-related exceptions.
@@ -21,7 +21,7 @@ from kickstart_exceptions import KickstartException
from virtualization.errors import VirtualizationException
-class VirtualizationKickstartException(VirtualizationException,
+class VirtualizationKickstartException(VirtualizationException,
KickstartException):
"""General kickstart exception for virtualization."""
pass
diff --git a/client/tools/rhn-kickstart/test/test-copy-files.py \
b/client/tools/rhn-kickstart/test/test-copy-files.py index 251dec3..5e6598f 100644
--- a/client/tools/rhn-kickstart/test/test-copy-files.py
+++ b/client/tools/rhn-kickstart/test/test-copy-files.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
#
# Copy files
@@ -21,8 +21,8 @@ from kickstart import kickstart
if __name__ == '__main__':
c = kickstart.FileCopier(["/etc/passwd", "/etc/shadow",
- "/etc/sysconfig", "/a/b", "/etc/rc", "/dev/null", "/etc/rmt",
- "/etc/tnsnames.ora", ],
+ "/etc/sysconfig", "/a/b", "/etc/rc", "/dev/null", "/etc/rmt",
+ "/etc/tnsnames.ora", ],
"/tmp/googah",
quota00000)
c.copy()
diff --git a/client/tools/rhn-virtualization/actions/virt.py \
b/client/tools/rhn-virtualization/actions/virt.py index f11c447..f00f738 100644
--- a/client/tools/rhn-virtualization/actions/virt.py
+++ b/client/tools/rhn-virtualization/actions/virt.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import sys
diff --git a/client/tools/rhn-virtualization/virtualization/__init__.py \
b/client/tools/rhn-virtualization/virtualization/__init__.py index 1e706f1..42215d8 \
100644
--- a/client/tools/rhn-virtualization/virtualization/__init__.py
+++ b/client/tools/rhn-virtualization/virtualization/__init__.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
#
diff --git a/client/tools/rhn-virtualization/virtualization/batching_log_notifier.py \
b/client/tools/rhn-virtualization/virtualization/batching_log_notifier.py index \
cc6f8a5..6e6e8e4 100644
--- a/client/tools/rhn-virtualization/virtualization/batching_log_notifier.py
+++ b/client/tools/rhn-virtualization/virtualization/batching_log_notifier.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
#
@@ -34,7 +34,7 @@ class BatchingLogNotifier:
def __init__(self, batch_notify_handler):
self.__log_message_queue = LockableLogMessageQueue()
- self.__notify_thread = NotifyThread(self.__log_message_queue,
+ self.__notify_thread = NotifyThread(self.__log_message_queue,
batch_notify_handler)
def add_log_message(self, log_message):
@@ -89,7 +89,7 @@ class BatchNotifyHandler:
This is just a stub class, which should be inherited by anyone who wants
to respond to logging events.
"""
-
+
def __init__(self):
pass
@@ -126,7 +126,7 @@ class NotifyThread(Thread):
while not self.__stop_event.isSet():
self.__flush_log_message_queue()
self.__stop_event.wait(POLL_INTERVAL)
-
+
# We've been signaled to stop, but flush the queue one more time before
# exiting.
self.__flush_log_message_queue()
diff --git a/client/tools/rhn-virtualization/virtualization/domain_config.py \
b/client/tools/rhn-virtualization/virtualization/domain_config.py index \
76f1743..661c7a3 100644
--- a/client/tools/rhn-virtualization/virtualization/domain_config.py
+++ b/client/tools/rhn-virtualization/virtualization/domain_config.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
from xml.dom.minidom import parse
@@ -38,7 +38,7 @@ class DomainConfigItem:
self.data_type = data_type
class DomainConfig:
-
+
###########################################################################
# Constants
###########################################################################
@@ -54,7 +54,7 @@ class DomainConfig:
COMMAND_LINE = DomainConfigItem("domain/os/cmdline", DataType.VALUE)
KERNEL_PATH = DomainConfigItem("domain/os/kernel", DataType.VALUE)
RAMDISK_PATH = DomainConfigItem("domain/os/initrd", DataType.VALUE)
- DISK_IMAGE_PATH = DomainConfigItem("domain/devices/disk/source/file",
+ DISK_IMAGE_PATH = DomainConfigItem("domain/devices/disk/source/file",
DataType.ATTRIBUTE)
DOMAIN_ID = DomainConfigItem("domain/id", DataType.ATTRIBUTE)
@@ -110,7 +110,7 @@ class DomainConfig:
*config_item.path.split("/"))
elif config_item.data_type == DataType.VALUE:
return self.__getElementValue(
- self.__dom_tree,
+ self.__dom_tree,
*config_item.path.split("/"))
raise DomainConfigError("Unknown config item data type '%s'" % \
@@ -130,7 +130,7 @@ class DomainConfig:
*config_item.path.split("/"))
elif config_item.data_type == DataType.VALUE:
return self.__removeElementValue(
- self.__dom_tree,
+ self.__dom_tree,
*config_item.path.split("/"))
raise DomainConfigError("Unknown config item data type '%s'" % \
@@ -172,7 +172,7 @@ class DomainConfig:
command_line_dict[key] = None
if len(command_line_args) >= 2:
command_line_dict[key] = '='.join(command_line_args[1:])
-
+
# Look for the "method" argument. This is a good indication that
# the instance is in the installer.
if (command_line_dict.has_key("method") or
@@ -192,8 +192,8 @@ class DomainConfig:
if len(found.childNodes) == 0:
raise DomainConfigError, \
"Unable to find config value: " + "/".join(tag_path)
-
- return found.childNodes[0].data
+
+ return found.childNodes[0].data
def __getElementAttribute(self, start_tree, *tag_path):
"""
@@ -216,13 +216,13 @@ class DomainConfig:
if len(found.childNodes) == 0:
raise DomainConfigError, \
"Unable to find config value: " + "/".join(tag_path)
-
+
found.parentNode.removeChild(found)
def __removeElementAttribute(self, start_tree, *tag_path):
attribute_name = tag_path[-1]
found = self.__extractElement(start_tree, *tag_path[:-1])
-
+
if not found.hasAttribute(attribute_name):
raise DomainConfigError, \
"Unable to find config attribute: " + "/".join(tag_path)
@@ -255,7 +255,7 @@ class DomainConfig:
found.setAttribute(attribute_name, str(value))
def __makeElement(self, start_tree, *tag_path):
- # If there are no more tags left in the path, there's nothing more to
+ # If there are no more tags left in the path, there's nothing more to
# add.
if len(tag_path) == 0:
return start_tree
@@ -303,7 +303,7 @@ class DomainConfig:
tag_node = node_list[0]
return self.__extractElement(tag_node, *tag_path[1:])
- # If we got here, we couldn't find the tag in question. Raise an
+ # If we got here, we couldn't find the tag in question. Raise an
# exception
raise DomainConfigError, "Could not locate tag " + str(tag)
diff --git a/client/tools/rhn-virtualization/virtualization/domain_control.py \
b/client/tools/rhn-virtualization/virtualization/domain_control.py index \
9b29a9d..dd5622f 100755
--- a/client/tools/rhn-virtualization/virtualization/domain_control.py
+++ b/client/tools/rhn-virtualization/virtualization/domain_control.py
@@ -28,7 +28,7 @@ except:
def shutdown(uuid):
"""
Shuts down the domain with the given UUID. If the instance is crashed, it
- is destroyed. If the instance is paused, it is unpaused and shutdown
+ is destroyed. If the instance is paused, it is unpaused and shutdown
cleanly.
"""
state = poller.poll_state(uuid)
@@ -51,7 +51,7 @@ def start(uuid):
elif state.is_paused():
resume(uuid)
else:
- start_domain.start_domain(uuid)
+ start_domain.start_domain(uuid)
def suspend(uuid):
"""
@@ -68,7 +68,7 @@ def resume(uuid):
def reboot(uuid):
"""
Reboots the domain with the given UUID. If the system is paused, we
- unpause and reboot it. If the system is stopped, we start it. If the
+ unpause and reboot it. If the system is stopped, we start it. If the
system is crashed, we destroy and restart it.
"""
state = poller.poll_state(uuid)
@@ -100,7 +100,7 @@ def setVCPUs(uuid, vcpus):
Sets the number of vcpus for the domain with the given UUID.
"""
_call_domain_control_routine(uuid, "setVcpus", vcpus)
-
+
###############################################################################
# Helper Routines
@@ -149,10 +149,10 @@ def _call_domain_control_routine(uuid, routine_name, *args):
raise VirtualizationException, \
"LibVirt Error %s: %s" % \
(routine_name, str(le)), sys.exc_info()[2]
-
+
# Handle the return code. Anything non-zero is an error.
if result != 0:
raise VirtualizationException, \
"Could not perform function '%s' on domain %s. Error: %s" % \
(routine_name, uuid, str(result)), sys.exc_info()[2]
-
+
diff --git a/client/tools/rhn-virtualization/virtualization/domain_directory.py \
b/client/tools/rhn-virtualization/virtualization/domain_directory.py index \
ae95ff5..51e2c02 100644
--- a/client/tools/rhn-virtualization/virtualization/domain_directory.py
+++ b/client/tools/rhn-virtualization/virtualization/domain_directory.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import binascii
@@ -86,7 +86,7 @@ class DomainDirectory:
def load_config(self, uuid):
"""
- This function loads a domain's configuration by its UUID. A
+ This function loads a domain's configuration by its UUID. A
DomainConfig object is returned.
"""
return DomainConfig(self.__path, uuid)
@@ -110,18 +110,18 @@ class DomainDirectory:
passed in the domain_uuids list. If the UUID is already known, it is
skipped.
"""
-
+
for uuid in domain_uuids:
# If we already have a config for this uuid, skip it. Also, don't
# try to figure out a config for a host UUID.
if not is_host_uuid(uuid) and not self.is_known_config(uuid):
- # The UUID is a formatted string. Turn it back into a number,
+ # The UUID is a formatted string. Turn it back into a number,
# since that's what libvirt wants.
dehyphenized_uuid = dehyphenize_uuid(uuid)
uuid_as_num = binascii.unhexlify(dehyphenized_uuid)
-
+
# Lookup the domain by its uuid.
try:
domain = self.conn.lookupByUUID(uuid_as_num)
@@ -138,7 +138,7 @@ class DomainDirectory:
cfg_file_path = self.__write_xml_file(uuid, xml)
new_config = DomainConfig(self.__path, uuid)
- # Don't record the config this time if the domain is
+ # Don't record the config this time if the domain is
# installing; we don't want to restart the domain later and
# make it re-install itself.
if not new_config.isInstallerConfig():
@@ -146,8 +146,8 @@ class DomainDirectory:
# Now we'll reformat the configuration object so that it's
# valid the next time this domain runs..
self.__fixup_config_for_restart(new_config)
-
- # The config is now prepared. Save it and move on to the
+
+ # The config is now prepared. Save it and move on to the
# next uuid.
new_config.save()
@@ -165,20 +165,20 @@ class DomainDirectory:
whatever the hypervisor wants to assign to it, so we should not
try to assign it explicitly.
- - Determine whether the config contains an <os> section.
- - If it does, check whether the kernel and the initrd files
- it refers to actually exist on disk.
+ - Determine whether the config contains an <os> section.
+ - If it does, check whether the kernel and the initrd files
+ it refers to actually exist on disk.
- If so, do nothing.
- If not, remove the entire <os> section and insert a
<bootloader> section if one does not yet exist. These
- files might not exist if the instance was started by xm
- using a bootloader such as pygrub, which makes temporary
+ files might not exist if the instance was started by xm
+ using a bootloader such as pygrub, which makes temporary
copies of the kernel & initrd and then removes them after
starting the instance.
- If it does not, ensure there is a <bootloader> section or
add one if needed.
"""
- # Remove the domain ID from the XML. This is a runtime value that
+ # Remove the domain ID from the XML. This is a runtime value that
# should not be assigned statically.
if config.hasConfigItem(DomainConfig.DOMAIN_ID):
config.removeConfigItem(DomainConfig.DOMAIN_ID)
@@ -207,7 +207,7 @@ class DomainDirectory:
if not config.hasConfigItem(DomainConfig.BOOTLOADER):
config.setConfigItem(DomainConfig.BOOTLOADER, "/usr/bin/pygrub")
-
+
def __write_xml_file(self, uuid, xml):
cfg_pathname = self.get_config_path(uuid)
cfg_file = open(cfg_pathname, "w")
diff --git a/client/tools/rhn-virtualization/virtualization/errors.py \
b/client/tools/rhn-virtualization/virtualization/errors.py index 3a7452e..c1e78f3 \
100644
--- a/client/tools/rhn-virtualization/virtualization/errors.py
+++ b/client/tools/rhn-virtualization/virtualization/errors.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
class VirtualizationException(Exception): pass
diff --git a/client/tools/rhn-virtualization/virtualization/get_config_value.py \
b/client/tools/rhn-virtualization/virtualization/get_config_value.py index \
f339a22..32f1444 100644
--- a/client/tools/rhn-virtualization/virtualization/get_config_value.py
+++ b/client/tools/rhn-virtualization/virtualization/get_config_value.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import sys
diff --git a/client/tools/rhn-virtualization/virtualization/init_action.py \
b/client/tools/rhn-virtualization/virtualization/init_action.py index \
8bbd893..135f128 100644
--- a/client/tools/rhn-virtualization/virtualization/init_action.py
+++ b/client/tools/rhn-virtualization/virtualization/init_action.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import sys
diff --git a/client/tools/rhn-virtualization/virtualization/notification.py \
b/client/tools/rhn-virtualization/virtualization/notification.py index \
3a31739..e36043f 100644
--- a/client/tools/rhn-virtualization/virtualization/notification.py
+++ b/client/tools/rhn-virtualization/virtualization/notification.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
#
@@ -58,13 +58,13 @@ class Plan:
def add(self, event, target = None, properties = {}):
"""
Creates a new plan item and adds it to the list.
- """
+ """
self.__items.append(self.__make_item(event, target, properties))
def execute(self):
"""
Sends all items in the plan to the satellite.
- """
+ """
systemid = up2dateAuth.getSystemId()
if systemid is None:
@@ -77,7 +77,7 @@ class Plan:
except up2dateErrors.CommunicationError, e:
log.trace_me()
log.log_me(e)
-
+
def __make_item(self, event, target, properties):
"""
diff --git a/client/tools/rhn-virtualization/virtualization/poller.py \
b/client/tools/rhn-virtualization/virtualization/poller.py index e78149f..ca70011 \
100644
--- a/client/tools/rhn-virtualization/virtualization/poller.py
+++ b/client/tools/rhn-virtualization/virtualization/poller.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import sys
@@ -59,10 +59,10 @@ options = None
def poll_hypervisor():
"""
- This function polls the hypervisor for information about the currently
+ This function polls the hypervisor for information about the currently
running set of domains. It returns a dictionary object that looks like the
following:
-
+
{ uuid : { 'name' : '...',
'uuid' : '...',
'virt_type' : '...',
@@ -70,7 +70,7 @@ def poll_hypervisor():
'vcpus' : '...',
'state' : '...' }, ... }
"""
- if not libvirt:
+ if not libvirt:
return {}
try:
@@ -106,7 +106,7 @@ def poll_hypervisor():
virt_type = VirtualizationType.PARA
if is_fully_virt(domain):
virt_type = VirtualizationType.FULLY
-
+
# we need to filter out the small per/minute KB changes
# that occur inside a vm. To do this we divide by 1024 to
# drop our precision down to megabytes with an int then
@@ -133,7 +133,7 @@ def poll_through_vdsm(server):
Libvirt is disabled by default on RHEV-M managed clients.
* Imports the localvdsm client that talks to the localhost
and fetches the list of vms and their info.
- * Extract the data and construct the state to pass it to the
+ * Extract the data and construct the state to pass it to the
execution plan for guest polling.
* The server should account for business rules similar to
xen/kvm.
@@ -194,9 +194,9 @@ def poll_state(uuid):
raise VirtualizationException, \
"Failed to open connection to hypervisor."
- # Attempt to connect to the domain. Since there is technically no
- # "stopped" state, we will assume that if we cannot connect the domain is
- # not running. Unfortunately, we can't really determine if the domain
+ # Attempt to connect to the domain. Since there is technically no
+ # "stopped" state, we will assume that if we cannot connect the domain is
+ # not running. Unfortunately, we can't really determine if the domain
# actually exists.
domain = None
try:
@@ -215,11 +215,11 @@ def poll_state(uuid):
def _send_notifications(poller_state):
"""
- This function will send notifications based on vm state change to the
- server. To reduce the possibility of spamming the server but still
+ This function will send notifications based on vm state change to the
+ server. To reduce the possibility of spamming the server but still
maintain an element of consistency, it will compare the previous poll state
against the current poll state and only send notifications if something has
- changed. In the event that the cache might have gotten into an
+ changed. In the event that the cache might have gotten into an
inconsistent state, the cache will be removed after every 50 polls (this is
about every 1.5 hours). This will cause the full state to be re-uploaded
and put things back in sync, if necessary.
@@ -303,7 +303,7 @@ if __name__ == "__main__":
cached_state = PollerStateCache(domain_list,
debug = options and options.debug)
-
+
# Send notifications, if necessary.
_send_notifications(cached_state)
diff --git a/client/tools/rhn-virtualization/virtualization/poller_state_cache.py \
b/client/tools/rhn-virtualization/virtualization/poller_state_cache.py index \
3ec4b1a..9dc964c 100644
--- a/client/tools/rhn-virtualization/virtualization/poller_state_cache.py
+++ b/client/tools/rhn-virtualization/virtualization/poller_state_cache.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import sys
@@ -40,8 +40,8 @@ class PollerStateCache:
def __init__(self, domain_data, debug = 0):
"""
- This method creates a new poller state based on the provided domain
- list. The domain_data list should be in the form returned from
+ This method creates a new poller state based on the provided domain
+ list. The domain_data list should be in the form returned from
poller.poll_hypervisor. That is,
{ uuid : { 'name' : '...',
@@ -92,14 +92,14 @@ class PollerStateCache:
def get_modified(self):
"""
- Returns a list of uuids for each domain that has been modified since
+ Returns a list of uuids for each domain that has been modified since
the last state poll.
"""
return self.__modified
def get_removed(self):
"""
- Returns a list of uuids for each domain that has been removed since
+ Returns a list of uuids for each domain that has been removed since
the last state poll.
"""
return self.__removed
@@ -121,7 +121,7 @@ class PollerStateCache:
# We'll only complain if debugging is enabled.
self._log_debug("Could not open cache file '%s': %s" % \
(CACHE_DATA_PATH, str(ioe)))
-
+
# Now, if a previous state was cached, load it.
state = {}
if cache_file:
@@ -137,7 +137,7 @@ class PollerStateCache:
cache_file.close()
cache_file.close()
-
+
if state:
self._log_debug("Loaded state: %s" % repr(state))
@@ -150,7 +150,7 @@ class PollerStateCache:
os.unlink(CACHE_DATA_PATH)
else:
self.__old_domain_data = state['domain_data']
-
+
else:
self.__old_domain_data = None
self.__expire_time = None
@@ -163,7 +163,7 @@ class PollerStateCache:
cache_dir_path = os.path.dirname(CACHE_DATA_PATH)
if not os.path.exists(cache_dir_path):
os.makedirs(cache_dir_path, 0700)
-
+
state = {}
state['domain_data'] = self.__new_domain_data
if self.__expire_time is None or self.is_expired():
@@ -179,15 +179,15 @@ class PollerStateCache:
def _compare_domain_data(self):
"""
- Compares the old domain_data to the new domain_data. Returns a tuple
+ Compares the old domain_data to the new domain_data. Returns a tuple
of lists, relative to the new domain_data:
-
+
(added, removed, modified)
"""
self.__added = {}
self.__removed = {}
self.__modified = {}
-
+
# First, figure out the modified and added uuids.
if self.__new_domain_data:
for (uuid, new_properties) in self.__new_domain_data.items():
@@ -199,7 +199,7 @@ class PollerStateCache:
old_properties = self.__old_domain_data[uuid]
if old_properties != new_properties:
self.__modified[uuid] = self.__new_domain_data[uuid]
-
+
# Now, figure out the removed uuids.
if self.__old_domain_data:
for uuid in self.__old_domain_data.keys():
@@ -207,7 +207,7 @@ class PollerStateCache:
not self.__new_domain_data.has_key(uuid):
self.__removed[uuid] = self.__old_domain_data[uuid]
-
+
def _log_debug(self, msg, include_trace = 0):
if self.__debug:
print "DEBUG: " + str(msg)
diff --git a/client/tools/rhn-virtualization/virtualization/schedule_poller.py \
b/client/tools/rhn-virtualization/virtualization/schedule_poller.py index \
ae74f0b..e100567 100644
--- a/client/tools/rhn-virtualization/virtualization/schedule_poller.py
+++ b/client/tools/rhn-virtualization/virtualization/schedule_poller.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import sys
@@ -48,7 +48,7 @@ def create_crontab_line(minute = None,\
month = string.strip(str(month))
if type(dow) != types.StringType:
dow = string.strip(str(dow))
-
+
str_template = "%s %s %s %s %s %s %s\n"
output_string = str_template % (minute, hour, dom, month, dow, user, command)
@@ -80,11 +80,11 @@ def schedule_poller(minute=None, hour=None, dom=None, month=None, \
dow=None):
return (1, "Attempt to schedule poller failed: %s, %s" % (str(status), \
str(output))) else:
return (0, "Scheduling of poller succeeded!")
-
+
if __name__ == "__main__":
- schedule_poller(minute="0-59/2")
-
-
-
+ schedule_poller(minute="0-59/2")
+
+
+
diff --git a/client/tools/rhn-virtualization/virtualization/start_domain.py \
b/client/tools/rhn-virtualization/virtualization/start_domain.py index \
cd8eddd..522b3ef 100644
--- a/client/tools/rhn-virtualization/virtualization/start_domain.py
+++ b/client/tools/rhn-virtualization/virtualization/start_domain.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import commands
@@ -45,8 +45,8 @@ def start_domain(uuid):
# Connect to the hypervisor.
connection = libvirt.open(None)
- # We will attempt to determine if the domain is configured to use a
- # bootloader. If not, we'll have to explicitly use the kernel and initrd
+ # We will attempt to determine if the domain is configured to use a
+ # bootloader. If not, we'll have to explicitly use the kernel and initrd
# data provided in the config to start the domain.
try:
config.getConfigItem(DomainConfig.BOOTLOADER)
@@ -55,7 +55,7 @@ def start_domain(uuid):
# the disk image if its Xen. For fully virt we dont have pygrub, it
# directly emulates the BIOS loading the first sector of the boot disk.
if connection.getType() == 'Xen':
- # This uses pygrub which comes only with xen
+ # This uses pygrub which comes only with xen
_prepare_guest_kernel_and_ramdisk(config)
# Now, we'll restart the instance, this time using the re-create XML.
@@ -73,7 +73,7 @@ def start_domain(uuid):
def _prepare_guest_kernel_and_ramdisk(config):
"""
Use PyGrub to extract the kernel and ramdisk from the given disk image.
- """
+ """
disk_image = config.getConfigItem(DomainConfig.DISK_IMAGE_PATH)
diff --git a/client/tools/rhn-virtualization/virtualization/state.py \
b/client/tools/rhn-virtualization/virtualization/state.py index 6b3a8d9..3e25e53 \
100755
--- a/client/tools/rhn-virtualization/virtualization/state.py
+++ b/client/tools/rhn-virtualization/virtualization/state.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import sys
@@ -24,11 +24,11 @@ from virtualization.constants import StateType
class State:
"""
- This class represents the state of a virtual instance. It provides
+ This class represents the state of a virtual instance. It provides
abstraction to categorize the state into running, stopped, paused, or
crashed.
"""
-
+
def __init__(self, state_type):
"""
Create a new state. If state_type is None, this state is assumed to be
@@ -50,20 +50,20 @@ class State:
self.__state_type == StateType.RUNNING or \
self.__state_type == StateType.BLOCKED or \
self.__state_type == StateType.SHUTDOWN
-
+
def is_paused(self):
"""
Returns true if this object represents a paused instance.
"""
return self.__state_type == StateType.PAUSED
-
+
def is_stopped(self):
"""
Returns true if this object represents a stopped instance.
"""
return self.__state_type == None or \
self.__state_type == StateType.SHUTOFF
-
+
def is_crashed(self):
"""
Returns true if this object represents a crashed instance.
diff --git a/client/tools/rhn-virtualization/virtualization/util.py \
b/client/tools/rhn-virtualization/virtualization/util.py index c19aa0c..a30099a \
100644
--- a/client/tools/rhn-virtualization/virtualization/util.py
+++ b/client/tools/rhn-virtualization/virtualization/util.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import random
@@ -39,7 +39,7 @@ def hyphenize_uuid(uuid):
return new_uuid
def dehyphenize_uuid(uuid):
- if uuid is None:
+ if uuid is None:
return uuid
return uuid.replace('-', '')
diff --git a/client/tools/rhncfg/actions/ModeController.py \
b/client/tools/rhncfg/actions/ModeController.py index 7dbfe74..1aaa93e 100644
--- a/client/tools/rhncfg/actions/ModeController.py
+++ b/client/tools/rhncfg/actions/ModeController.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import sys
@@ -23,14 +23,14 @@ class ModeMissingException(Exception):
class ModeController:
def __init__(self, force=None):
self.mode_list = {} #Indexed on the name of the mode
- self.force = False
-
- #Enable the mode.
+ self.force = False
+
+ #Enable the mode.
def on(self, mode_name):
if self.mode_list.has_key(mode_name):
self.mode_list[mode_name].on()
else:
- raise ModeMissingException()
+ raise ModeMissingException()
#Disable the mode
def off(self, mode_name):
@@ -38,7 +38,7 @@ class ModeController:
self.mode_list[mode_name].off()
else:
raise ModeMissingException()
-
+
#Turn on all of the modes.
def all_on(self):
for m in self.mode_list.keys():
@@ -105,7 +105,7 @@ class ConfigFilesModeController(ModeController):
if mode_name != 'all':
if self.is_off('all'):
ModeController.on(self, mode_name)
-
+
#Go through each of the modes and see if they're on. If they're all \
on, then place the 'all' file in there. all_modes_on = 1
for m in self.mode_list.keys():
@@ -136,13 +136,13 @@ class ConfigFilesModeController(ModeController):
self.mode_list[mode_name].off()
else:
self.all_off()
-
+
#This is a little different when the 'all' file is used.
#There shouldn't be any other files in the directory when 'all' is used.
def all_on(self):
#Get rid of all of the files.
- self.all_off()
+ self.all_off()
#Turn on the 'all' mode.
self.mode_list['all'].on()
@@ -160,4 +160,4 @@ def ask_before_continuing(question=None):
if answer == 'n':
sys.exit(0)
-
+
diff --git a/client/tools/rhncfg/actions/ModeControllerCreator.py \
b/client/tools/rhncfg/actions/ModeControllerCreator.py index 792a6a6..57d2581 100644
--- a/client/tools/rhncfg/actions/ModeControllerCreator.py
+++ b/client/tools/rhncfg/actions/ModeControllerCreator.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import sys
@@ -24,7 +24,7 @@ class ModeControllerCreator:
self.mode_list = mode_list or []
#A reference to a class obj. This is the type of controller that will be \
returned by create_controller.
- self.controller_class = ModeController.ModeController
+ self.controller_class = ModeController.ModeController
#Sets the class that the controller will be instantiated as. The constructor for \
the class shouldn't have #to take any parameters.
@@ -38,7 +38,7 @@ class ModeControllerCreator:
#using the Modes in self.mode_list, create, populate, and return a \
ModeController def create_controller(self):
controller = self.controller_class()
-
+
for m in self.mode_list:
controller.add_mode(m)
@@ -49,7 +49,7 @@ def get_controller_creator():
mode_list = [Modes.SolarisDeployMode(), Modes.SolarisDiffMode(), \
Modes.SolarisUploadMode(), Modes.SolarisMTimeUploadMode(), Modes.SolarisAllMode()] \
else:
mode_list = [Modes.DeployMode(), Modes.DiffMode(), Modes.UploadMode(), \
Modes.MTimeUploadMode(), Modes.AllMode()]
-
+
controller = ModeControllerCreator(mode_list=mode_list)
controller.set_controller_class(ModeController.ConfigFilesModeController)
return controller
diff --git a/client/tools/rhncfg/actions/Modes.py \
b/client/tools/rhncfg/actions/Modes.py index ce3ce19..2c3bd6f 100644
--- a/client/tools/rhncfg/actions/Modes.py
+++ b/client/tools/rhncfg/actions/Modes.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -90,19 +90,19 @@ class ConfigFilesBaseMode(BaseMode):
BaseMode.__init__(self)
self.ph = PathHandler()
self.name = None #Must be set in subclass
-
+
def on(self):
self.ph.add_file(self.name)
self.state = True
-
+
def off(self):
self.ph.remove_file(self.name)
self.state = False
-
- #Could probably just check the value of state...
+
+ #Could probably just check the value of state...
def is_on(self):
return self.ph.check_for_file(self.name)
-
+
def is_off(self):
if self.ph.check_for_file(self.name):
return False
@@ -113,7 +113,7 @@ class RunMode(ConfigFilesBaseMode):
def __init__(self):
ConfigFilesBaseMode.__init__(self)
self.name = "run"
- self.ph.set_rhn_root("/etc/sysconfig/rhn/allowed-actions/script")
+ self.ph.set_rhn_root("/etc/sysconfig/rhn/allowed-actions/script")
class RunAllMode(ConfigFilesBaseMode):
def __init__(self):
@@ -130,7 +130,7 @@ class DeployMode(ConfigFilesBaseMode):
def __init__(self):
ConfigFilesBaseMode.__init__(self)
self.name = "deploy"
-
+
class DiffMode(ConfigFilesBaseMode):
def __init__(self):
ConfigFilesBaseMode.__init__(self)
@@ -151,7 +151,7 @@ class SolarisRunMode(ConfigFilesBaseMode):
def __init__(self):
ConfigFilesBaseMode.__init__(self)
self.name = "run"
- self.ph.set_rhn_root("/opt/redhat/rhn/solaris/etc/sysconfig/rhn/allowed-actions/script")
+ self.ph.set_rhn_root("/opt/redhat/rhn/solaris/etc/sysconfig/rhn/allowed-actions/script")
class SolarisAllRunMode(ConfigFilesBaseMode):
def __init__(self):
@@ -163,30 +163,30 @@ class SolarisAllMode(ConfigFilesBaseMode):
def __init__(self):
ConfigFilesBaseMode.__init__(self)
self.name = "all"
- self.ph.set_rhn_root("/opt/redhat/rhn/solaris/etc/sysconfig/rhn/allowed-actions/configfiles")
+ self.ph.set_rhn_root("/opt/redhat/rhn/solaris/etc/sysconfig/rhn/allowed-actions/configfiles")
class SolarisDeployMode(ConfigFilesBaseMode):
def __init__(self):
ConfigFilesBaseMode.__init__(self)
self.name = "deploy"
- self.ph.set_rhn_root("/opt/redhat/rhn/solaris/etc/sysconfig/rhn/allowed-actions/configfiles")
-
+ self.ph.set_rhn_root("/opt/redhat/rhn/solaris/etc/sysconfig/rhn/allowed-actions/configfiles")
+
class SolarisDiffMode(ConfigFilesBaseMode):
def __init__(self):
ConfigFilesBaseMode.__init__(self)
self.name = "diff"
- self.ph.set_rhn_root("/opt/redhat/rhn/solaris/etc/sysconfig/rhn/allowed-actions/configfiles")
+ self.ph.set_rhn_root("/opt/redhat/rhn/solaris/etc/sysconfig/rhn/allowed-actions/configfiles")
class SolarisUploadMode(ConfigFilesBaseMode):
def __init__(self):
ConfigFilesBaseMode.__init__(self)
self.name = "upload"
- self.ph.set_rhn_root("/opt/redhat/rhn/solaris/etc/sysconfig/rhn/allowed-actions/configfiles")
+ self.ph.set_rhn_root("/opt/redhat/rhn/solaris/etc/sysconfig/rhn/allowed-actions/configfiles")
class SolarisMTimeUploadMode(ConfigFilesBaseMode):
def __init__(self):
ConfigFilesBaseMode.__init__(self)
self.name = "mtime_upload"
- self.ph.set_rhn_root("/opt/redhat/rhn/solaris/etc/sysconfig/rhn/allowed-actions/configfiles")
+ self.ph.set_rhn_root("/opt/redhat/rhn/solaris/etc/sysconfig/rhn/allowed-actions/configfiles")
diff --git a/client/tools/rhncfg/actions/__init__.py \
b/client/tools/rhncfg/actions/__init__.py index fb3600e..3830a2a 100644
--- a/client/tools/rhncfg/actions/__init__.py
+++ b/client/tools/rhncfg/actions/__init__.py
@@ -7,9 +7,9 @@
# 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.
+# in this software or its documentation.
#
diff --git a/client/tools/rhncfg/actions/configfiles.py \
b/client/tools/rhncfg/actions/configfiles.py index 5aacdae..f50454a 100755
--- a/client/tools/rhncfg/actions/configfiles.py
+++ b/client/tools/rhncfg/actions/configfiles.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -59,7 +59,7 @@ def _local_permission_check(action_type):
potential_all_path = apply(os.path.join, all_structure)
if os.path.exists(os.path.join(_permission_root_dir, potential_all_path)):
return 1
-
+
action_path = apply(os.path.join, atype_structure)
return os.path.exists(os.path.join(_permission_root_dir, action_path))
@@ -73,12 +73,12 @@ def _visit_dir(params, dirname, names):
info = params['info']
ignore_dirs = params['ignore']
now = params['now']
-
+
i = 0
while i < len(names):
full_path = os.path.join(dirname, names[i])
is_dir = os.path.isdir(full_path)
-
+
if is_dir:
if ignore_dirs.has_key(full_path):
# don't consider the entire subtree on subsequent runs of
@@ -94,7 +94,7 @@ def _visit_dir(params, dirname, names):
if not os.path.exists(full_path):
i = i + 1
continue
-
+
mtime = os.path.getmtime(full_path)
# do it via delta...
@@ -143,7 +143,7 @@ def mtime_upload(action_id, params, cache_only=None):
if not _local_permission_check(action_type):
log_to_file(0, "permissions error: " + str(action_type))
return _perm_error(action_type)
-
+
_init()
file_matches = []
@@ -170,7 +170,7 @@ def mtime_upload(action_id, params, cache_only=None):
r = rpc_cli_repository.ClientRepository()
result = r.put_files(action_id, file_matches, upload_contents=upload_contents)
-
+
formatted_result = format_result(result, file_matches)
log_to_file(0, formatted_result)
return formatted_result
@@ -184,7 +184,7 @@ def upload(action_id, params, cache_only=None):
if not _local_permission_check(action_type):
log_to_file(0, "permissions error: " + str(action_type))
return _perm_error(action_type)
-
+
_init()
files = params or []
@@ -210,7 +210,7 @@ def deploy(params, topdir=None, cache_only=None):
_init()
files = params.get('files') or []
dep_trans = DeployTransaction(transaction_root=topdir, auto_rollback=0)
-
+
for file in files:
dep_trans.add(file)
@@ -219,7 +219,7 @@ def deploy(params, topdir=None, cache_only=None):
#5/3/05 wregglej - 135415 Adding stuff for missing user info
except cfg_exceptions.UserNotFound, e:
try:
- dep_trans.rollback()
+ dep_trans.rollback()
except FailedRollback:
log_to_file(0, "Failed deployment and rollback, information on user \
'%s' could not be found" % (e[0], ))
return (44, "Failed deployment and rollback, information on user \
'%s' could not be found" % (e[0], ), {}) @@ -348,7 +348,7 @@ def diff(params, \
cache_only=None): extras = {}
if missing_files:
extras['missing_files'] = missing_files
-
+
if diffs:
for file in diffs.keys():
if not is_utf8(diffs[file]):
@@ -377,7 +377,7 @@ def format_file_string(file_list, keylist):
return outstr
#Returns a list of strings. Each string is a key in the dictionary containing file \
information.
-#The number of keys returned corresponds to the debug_level. The higher the \
debug_level, the longer the +#The number of keys returned corresponds to the \
debug_level. The higher the debug_level, the longer the #list of keys.
def create_key_list():
#The list of keys. The order of the keys determines what debug_level they will \
be returned in.
diff --git a/client/tools/rhncfg/actions/rhn-actions-control.py \
b/client/tools/rhncfg/actions/rhn-actions-control.py index 4c3b068..87ba6b6 100755
--- a/client/tools/rhncfg/actions/rhn-actions-control.py
+++ b/client/tools/rhncfg/actions/rhn-actions-control.py
@@ -8,10 +8,10 @@
# 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.
+# in this software or its documentation.
#
import sys
@@ -46,14 +46,14 @@ def main():
runcreator = ModeControllerCreator.get_run_controller_creator()
runcontroller = runcreator.create_controller()
- runcontroller.set_force(options.force)
+ runcontroller.set_force(options.force)
if options.enable_deploy:
controller.on('deploy')
if options.enable_diff:
controller.on('diff')
-
+
if options.enable_upload:
controller.on('upload')
@@ -83,21 +83,21 @@ def main():
if options.disable_all:
controller.all_off()
runcontroller.all_off()
-
+
if options.disable_run:
runcontroller.off('run')
runcontroller.off('all')
if options.report:
mode_list = ['deploy', 'diff', 'upload', 'mtime_upload']
-
+
for m in mode_list:
rstring = "%s is %s"
status = "disabled"
if controller.is_on(m):
status = "enabled"
print rstring % (m, status)
-
+
status = "disabled"
if runcontroller.is_on('all'):
runcontroller.off('all')
@@ -106,8 +106,8 @@ def main():
if runcontroller.is_on('run'):
status = "enabled"
print rstring % ('run', status)
-
-
+
+
if __name__ == "__main__":
try:
sys.exit(main() or 0)
diff --git a/client/tools/rhncfg/config_client/__init__.py \
b/client/tools/rhncfg/config_client/__init__.py index fb3600e..3830a2a 100644
--- a/client/tools/rhncfg/config_client/__init__.py
+++ b/client/tools/rhncfg/config_client/__init__.py
@@ -7,9 +7,9 @@
# 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.
+# in this software or its documentation.
#
diff --git a/client/tools/rhncfg/config_client/cli_repository.py \
b/client/tools/rhncfg/config_client/cli_repository.py index 7ad1e4e..68a4af4 100644
--- a/client/tools/rhncfg/config_client/cli_repository.py
+++ b/client/tools/rhncfg/config_client/cli_repository.py
@@ -8,10 +8,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -43,7 +43,7 @@ class ClientRepository:
if self.cfg_files:
return self.cfg_files
-
+
self.cfg_files = {}
for ns in self.config_channels:
for file in self.server_repository.list_files(ns):
diff --git a/client/tools/rhncfg/config_client/handler_base.py \
b/client/tools/rhncfg/config_client/handler_base.py index 2f3a6e5..c593b21 100644
--- a/client/tools/rhncfg/config_client/handler_base.py
+++ b/client/tools/rhncfg/config_client/handler_base.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_channels.py \
b/client/tools/rhncfg/config_client/rhncfgcli_channels.py index 1be7fb0..05796d2 \
100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_channels.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_channels.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
from config_common.rhn_log import log_debug
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_get.py \
b/client/tools/rhncfg/config_client/rhncfgcli_get.py index 5338ec8..f43dad9 100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_get.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_get.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import handler_base
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_list.py \
b/client/tools/rhncfg/config_client/rhncfgcli_list.py index 993caef..658f84a 100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_list.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_list.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
from config_common.rhn_log import log_debug, die
@@ -26,18 +26,18 @@ class Handler(handler_base.HandlerBase):
if not files:
die(1, "No managed files.")
-
+
label = "Config Channel"
maxlen = max(map(lambda s: len(s[0]), files))
maxlen = max(maxlen, len(label)) + 2
-
+
print "DoFoS %*s %s" % (maxlen, label, "File")
for file in files:
# checking to see if the filetype is in the 'file' entry,
# and if it is and that type is '1', it is a file
if (len(file) < 3) or file[2] == 1:
print "F %*s %s" % (maxlen, file[0], file[1])
- elif file[2] == 2 :
+ elif file[2] == 2 :
# the filetype is a directory
print "D %*s %s" % (maxlen, file[0], file[1])
else:
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_verify.py \
b/client/tools/rhncfg/config_client/rhncfgcli_verify.py index 93cc280..6c6a528 100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_verify.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_verify.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
from config_common import utils
@@ -35,7 +35,7 @@ class Handler(handler_base.HandlerBase):
_options_table = [
handler_base.HandlerBase._option_class(
'--verbose',
- "-v",
+ "-v",
action="count",
help="Increase the amount of output detail.",
),
@@ -61,7 +61,7 @@ class Handler(handler_base.HandlerBase):
file_status = "FILE"
status_help = "(channel:local)"
-
+
maxlenarr = {
'status' : len(status_label),
'owner' : max(len(owner_status), len(status_help)),
@@ -82,7 +82,7 @@ class Handler(handler_base.HandlerBase):
dst = self.get_dest_file(file)
- #Added file_info parameter, which contains information needed to look \
for differences in the owner, group, and mode. + #Added file_info \
parameter, which contains information needed to look for differences in the owner, \
group, and mode.
ret_dict = self._process_file(src, dst, file, ftype, file_info)
if self.options.verbose:
@@ -99,7 +99,7 @@ class Handler(handler_base.HandlerBase):
#Place the return values into a list so we can iterate through them \
later when we want to print them out. ret.append(ret_dict)
- if self.options.verbose:
+ if self.options.verbose:
formatstr = "%-*s" #format string for the fields where the length \
matters.
formatstr_nolimit = "%-s" #format string for the fields where the \
length of the field doesn't matter. Namely, the file field.
@@ -107,7 +107,7 @@ class Handler(handler_base.HandlerBase):
outstring = "%(status)s %(owner)s %(group)s %(mode)s %(selinux)s \
%(file)s"
#Print out the column labels.
- print outstring % {
+ print outstring % {
"status" : formatstr % \
(maxlenarr['status'], status_label),
"owner" : formatstr % \
(maxlenarr['owner'], owner_status),
"group" : formatstr % \
(maxlenarr['group'], group_status), @@ -176,7 +176,7 @@ class \
Handler(handler_base.HandlerBase): group_status = ""
perm_status = ""
selinux_status = ""
-
+
status = []
stat_err = 0
#Stat the destination file
@@ -196,14 +196,14 @@ class Handler(handler_base.HandlerBase):
dst_user = "unknown(UID %d)" % (dst_uid,)
else:
dst_user = "missing"
-
+
#owner_status gets displayed with the verbose option.
if src_user == dst_user:
owner_status = ""
else:
owner_status = owner_report % (src_user, dst_user)
status.append('user')
-
+
src_group = info['groupname']
if not stat_err:
#check for group differences
@@ -215,14 +215,14 @@ class Handler(handler_base.HandlerBase):
dst_group = "unknown(GID %d)" % (dst_gid,)
else:
dst_group = "missing"
-
+
#group_status gets displayed with the verbose option.
if src_group == dst_group:
group_status = ""
else:
group_status = group_report % (src_group, dst_group)
status.append('group')
-
+
#check for permissions differences
src_perm = str(info['filemode'])
if not stat_err:
@@ -233,11 +233,11 @@ class Handler(handler_base.HandlerBase):
dst_perm = str(oct(stat.S_IMODE(dst_stat[stat.ST_MODE])))
else:
dst_perm = "missing"
-
+
#rip off the leading '0' from the mode returned by stat()
if dst_perm[0] == '0':
dst_perm = dst_perm[1:]
-
+
#perm_status gets displayed with the verbose option.
if src_perm == dst_perm:
perm_status = ""
@@ -260,7 +260,7 @@ class Handler(handler_base.HandlerBase):
dst_selinux = ""
else:
dst_selinux = "missing"
-
+
if src_selinux == dst_selinux:
selinux_status = ""
else:
diff --git a/client/tools/rhncfg/config_client/rpc_cli_repository.py \
b/client/tools/rhncfg/config_client/rpc_cli_repository.py index 9f632b6..fa3eb11 \
100644
--- a/client/tools/rhncfg/config_client/rpc_cli_repository.py
+++ b/client/tools/rhncfg/config_client/rpc_cli_repository.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -24,30 +24,30 @@ from config_common.rhn_log import log_debug
import traceback
class ClientRepository(repository.RPC_Repository):
-
+
default_systemid = "/etc/sysconfig/rhn/systemid"
-
+
# bug #170825,169203: reusing the base class's default value for setup_network
def __init__(self, setup_network=1):
repository.RPC_Repository.__init__(self, setup_network)
-
+
systemid_file = local_config.get("systemid") or self.default_systemid
try:
f = open(systemid_file, "r")
except IOError, e:
sys.stderr.write("Cannot open %s: %s\n" % (systemid_file, e))
sys.exit(1)
-
+
self.system_id = f.read()
f.close()
log_debug(4, 'system id', self.system_id)
self.files_to_delete = []
-
+
def rpc_call(self, method_name, *params):
try:
- result = apply(repository.RPC_Repository.rpc_call,
+ result = apply(repository.RPC_Repository.rpc_call,
(self, method_name) + params)
except xmlrpclib.Fault, e:
if e.faultCode == -9:
@@ -96,7 +96,7 @@ class ClientRepository(repository.RPC_Repository):
return temp_file, result, dirs_created
def put_files(self, action_id, files, upload_contents=1):
- """Inserts a set of files into the repo, as a result of a scheduled
+ """Inserts a set of files into the repo, as a result of a scheduled
action"""
log_debug(4)
missing_files = []
@@ -104,7 +104,7 @@ class ClientRepository(repository.RPC_Repository):
failed_due_to_quota = []
max_file_size = self.get_maximum_file_size()
-
+
for file in files:
try:
params = self._make_file_info(file, local_path=None,
@@ -158,13 +158,13 @@ class ClientRepository(repository.RPC_Repository):
def _get_default_delimiters(self):
"retrieves the default delimiters from the server"
log_debug(4)
- result = self.rpc_call('config.client.get_default_delimiters',
+ result = self.rpc_call('config.client.get_default_delimiters',
self.system_id)
return result.get('delim_start'), result.get('delim_end')
def _get_maximum_file_size(self):
log_debug(4)
- result = self.rpc_call('config.client.get_maximum_file_size',
+ result = self.rpc_call('config.client.get_maximum_file_size',
self.system_id)
return result
diff --git a/client/tools/rhncfg/config_common/__init__.py \
b/client/tools/rhncfg/config_common/__init__.py index fb3600e..3830a2a 100644
--- a/client/tools/rhncfg/config_common/__init__.py
+++ b/client/tools/rhncfg/config_common/__init__.py
@@ -7,9 +7,9 @@
# 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.
+# in this software or its documentation.
#
diff --git a/client/tools/rhncfg/config_common/cfg_exceptions.py \
b/client/tools/rhncfg/config_common/cfg_exceptions.py index 0bd2037..c65d206 100644
--- a/client/tools/rhncfg/config_common/cfg_exceptions.py
+++ b/client/tools/rhncfg/config_common/cfg_exceptions.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
class InvalidSession(Exception):
diff --git a/client/tools/rhncfg/config_common/handler_base.py \
b/client/tools/rhncfg/config_common/handler_base.py index f74543f..a1308ed 100644
--- a/client/tools/rhncfg/config_common/handler_base.py
+++ b/client/tools/rhncfg/config_common/handler_base.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import sys
@@ -70,7 +70,7 @@ class HandlerBase:
rhn_log.die(1, "Session error: %s\n" % e)
def get_auth_info(self, username=None):
- if username is None:
+ if username is None:
username = self._read_username()
password = getpass.getpass()
@@ -90,4 +90,4 @@ class HandlerBase:
tty.write("\n")
sys.exit(0)
return string.strip(username)
-
+
diff --git a/client/tools/rhncfg/config_common/local_config.py \
b/client/tools/rhncfg/config_common/local_config.py index b7ef87c..c6829d7 100644
--- a/client/tools/rhncfg/config_common/local_config.py
+++ b/client/tools/rhncfg/config_common/local_config.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -26,7 +26,7 @@ class rhncfgConfigParser(ConfigParser.ConfigParser):
def __init__(self, section, defaults=None):
"""defaults is either None, or a dictionary of default values which can be \
overridden"""
- if defaults:
+ if defaults:
for (k, v) in defaults.iteritems():
if type(v) == int:
defaults[k] = str(v)
@@ -42,13 +42,13 @@ class rhncfgConfigParser(ConfigParser.ConfigParser):
try:
self.read(self._get_config_files())
except ConfigParser.MissingSectionHeaderError, e:
- print "Config error: line %s, file %s: %s" % (e.lineno,
+ print "Config error: line %s, file %s: %s" % (e.lineno,
e.filename, e)
sys.exit(1)
def _get_config_files(self):
if string.find(sys.platform, 'sunos') > -1:
- return [
+ return [
"/opt/redhat/rhn/solaris/etc/sysconfig/rhn/%s.conf" % self.section,
os.path.join(utils.get_home_dir(), self._local_config_file_name),
self._local_config_file_name,
@@ -68,25 +68,25 @@ class rhncfgConfigParser(ConfigParser.ConfigParser):
if self.mydefaults.has_key('server_list'):
if type(self.mydefaults['server_list']) is type([]):
return self.mydefaults['server_list']
-
+
try:
ret = self.get(self.section, option, vars=self.overrides)
#5/25/05 wregglej - 158694
#Move the cast to an int to here from the up2date_config_parser, that \
way the stuff that needs to get interpolated
- #gets interpolated, the stuff that should be an int ends up and int, and \
the stuff that's neither doesn't get + #gets interpolated, the stuff that \
should be an int ends up and int, and the stuff that's neither doesn't get #messed \
with. try:
if type(ret) != type([]):
ret = int(ret)
except ValueError:
pass
- return ret
- except (ConfigParser.NoOptionError, ConfigParser.NoSectionError), e:
+ return ret
+ except (ConfigParser.NoOptionError, ConfigParser.NoSectionError), e:
pass
defaults = self.defaults()
-
+
if defaults.has_key(option):
return defaults[option]
else:
@@ -101,7 +101,7 @@ class rhncfgConfigParser(ConfigParser.ConfigParser):
def init(section, defaults=None, **overrides):
cp = rhncfgConfigParser._instance = rhncfgConfigParser(section, defaults)
cp.read_config_files(overrides)
-
+
def get(var):
return _get_config().get_option(var)
diff --git a/client/tools/rhncfg/config_common/rhn_main.py \
b/client/tools/rhncfg/config_common/rhn_main.py index 63cbda1..78d8c7c 100644
--- a/client/tools/rhncfg/config_common/rhn_main.py
+++ b/client/tools/rhncfg/config_common/rhn_main.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
diff --git a/client/tools/rhncfg/config_common/rpc_wrapper.py \
b/client/tools/rhncfg/config_common/rpc_wrapper.py index 1d8e506..3d42fd0 100644
--- a/client/tools/rhncfg/config_common/rpc_wrapper.py
+++ b/client/tools/rhncfg/config_common/rpc_wrapper.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import sys
@@ -38,14 +38,14 @@ class NoMoreServers(Exception):
#The problem that spurred that was when a xmlrpc function was called on an object \
that was an #attribute of the server class it wasn't passing through the _request \
that I had written here, #it was going directly to rpclib.Server's _request() and \
missing all of the failover logic that I had added.
-#The short version is that I needed to make sure this class was in the inheritance \
hierarchy. +#The short version is that I needed to make sure this class was in the \
inheritance hierarchy. class Server(rpclib.Server):
def __init__(self, uri, transport=None, encoding=None, verbose=0,
proxy=None, username=None, password=None, refreshCallback=None,
progressCallback=None, server_list=None, rpc_handler=None):
self.list_of_uris = None #Contains all of the possible uris.
self.current_index = 0 #index of the uri that we're currently using.
-
+
#If server_list is None, then no failover systems were listed in the up2date \
config and
#we need to use the one that was put together in the rhncfg-* config, which \
was passed in as #uri.
@@ -70,7 +70,7 @@ class Server(rpclib.Server):
#Grabs the initial uri that we're going to use.
init_uri = self._get_uri()
-
+
#self.rpc_args = {
# 'transport' : transport,
# 'encoding' : encoding,
@@ -110,7 +110,7 @@ class Server(rpclib.Server):
if typ not in ("http", "https"):
raise InvalidRedirectionError(
"Redirected to unsupported protocol %s" % typ)
-
+
self._host, self._handler = urllib.splithost(uri)
self._orig_handler = self._handler
self._type = typ
@@ -146,7 +146,7 @@ class Server(rpclib.Server):
failover_uri = self._get_uri() #Grab the uri of the new server to use.
msg = msg + "Trying the next serverURL: %s\n" % failover_uri
- print msg
+ print msg
#Set up rpclib.Server to use the new uri.
self.init_server(failover_uri)
@@ -171,13 +171,13 @@ class Server(rpclib.Server):
except (error, sslerror, herror, gaierror, timeout), e:
save_traceback = sys.exc_info()[2]
try:
- self._failover()
+ self._failover()
except NoMoreServers, f:
raise e, None, save_traceback
continue
succeed = 1 #If we get here then the function call eventually succeeded \
and we don't need to try again. return ret
-
+
def _request(self, methodname, params):
return self._call_function(rpclib.Server._request, (self, methodname, \
params))
diff --git a/client/tools/rhncfg/config_common/transactions.py \
b/client/tools/rhncfg/config_common/transactions.py index 43758f7..8e3f3d3 100644
--- a/client/tools/rhncfg/config_common/transactions.py
+++ b/client/tools/rhncfg/config_common/transactions.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -61,7 +61,7 @@ class DeployTransaction:
def _generate_backup_path(self, path):
return "%s%s%s" % (BACKUP_PREFIX, path, BACKUP_EXTENSION)
-
+
def _rename_to_backup(self, path):
"""renames a file to it's new backup name"""
# ensure we haven't attempted to back this file up before
@@ -120,19 +120,19 @@ class DeployTransaction:
if file_info['filetype'] != 'symlink':
uid = file_info.get('uid')
if uid is None:
- if file_info.has_key('username'):
+ if file_info.has_key('username'):
# determine uid
-
+
try:
user_record = pwd.getpwnam(file_info['username'])
except Exception, e:
raise cfg_exceptions.UserNotFound(file_info['username']), \
None, sys.exc_info()[2]
-
+
uid = user_record[2]
else:
#default to root (3.2 sats)
uid = 0
-
+
gid = file_info.get('gid')
if gid is None:
if file_info.has_key('groupname'):
@@ -141,7 +141,7 @@ class DeployTransaction:
group_record = grp.getgrnam(file_info['groupname'])
except Exception, e:
raise cfg_exceptions.GroupNotFound(file_info['groupname']), \
None, sys.exc_info()[2]
-
+
gid = group_record[2]
else:
#default to root (3.2 sats)
@@ -176,9 +176,9 @@ class DeployTransaction:
sys.stderr.write("cannonical file ownership and permissions lost on \
%s\n" % dest_path) else:
raise
-
-
+
+
def _normalize_path_to_root(self, path):
if self.transaction_root:
path = utils.normalize_path(self.transaction_root + os.sep + path)
@@ -213,7 +213,7 @@ class DeployTransaction:
raise Exception("needed key %s mising from file structure" % k)
file_info['path'] = self._normalize_path_to_root(file_info['path'])
-
+
# Older servers will not return directories; if filetype is missing,
# assume file
if file_info.get('filetype') == 'directory':
@@ -256,7 +256,7 @@ class DeployTransaction:
log_debug(9, "directory reverted")
#remove any directories created by either mkdir_p or in the deploy
- self.new_dirs.reverse()
+ self.new_dirs.reverse()
for i in range(len(self.new_dirs)):
remove_dir = self.new_dirs[i]
log_debug(6, "removing directory %s that was created during transaction ..." % \
remove_dir) @@ -267,7 +267,7 @@ class DeployTransaction:
log_debug(9, "directory removed")
log_debug(3, "rollback successful")
-
+
def deploy(self):
"""attempt deployment; will rollback if auto_rollback is set"""
fp = file_utils.FileProcessor()
@@ -277,9 +277,9 @@ class DeployTransaction:
for dep_file in self.files:
if dep_file['filetype'] == 'symlink':
self.symlinks.append(dep_file)
-
+
# 0. handle any dirs we need to create first
- # a) if the dir exists, then just change the mode and owners,
+ # a) if the dir exists, then just change the mode and owners,
# else create it and then make sure the mode and owners are correct.
# b) if there are files, then continue
# 1. write new version (tmp)
@@ -291,7 +291,7 @@ class DeployTransaction:
# a) if anything breaks, remove all deployed files, then do 2-a.
#
# (yes, this leaves the backup version on disk...)
-
+
try:
# 0.
@@ -347,12 +347,12 @@ class DeployTransaction:
dirs_created = utils.mkdir_p(directory, None, self.symlinks, \
self.files) self.new_dirs.extend(dirs_created)
log_debug(7, "directories created and added to list for \
rollback")
-
+
# write the new contents to a tmp file, and store the path of the
# new tmp file by it's eventual target path
self.newtemp_by_path[path], temp_new_dirs = fp.process(dep_file, \
os.path.sep) self.new_dirs.extend(temp_new_dirs or [])
-
+
# properly chown and chmod it
self._chown_chmod_chcon(self.newtemp_by_path[path], path, dep_file)
log_debug(9, "tempfile written: %s" % self.newtemp_by_path[path])
@@ -364,7 +364,7 @@ class DeployTransaction:
# 2.
for path in paths:
if os.path.isdir(path) and not os.path.islink(path):
- raise cfg_exceptions.FileEntryIsDirectory(path)
+ raise cfg_exceptions.FileEntryIsDirectory(path)
else:
self._rename_to_backup(path)
if self.backup_by_path.has_key(path):
@@ -382,10 +382,10 @@ class DeployTransaction:
log_debug(9, "new version of %s deployed" % path)
log_debug(3, "deploy transaction successful")
-
+
except Exception:
#log_debug(1, traceback.format_exception_only(SyntaxError, e))
#traceback.print_exc()
if self.auto_rollback:
self.rollback()
- raise
\ No newline at end of file
+ raise
diff --git a/client/tools/rhncfg/config_common/utils.py \
b/client/tools/rhncfg/config_common/utils.py index 3b0826d..109ea76 100644
--- a/client/tools/rhncfg/config_common/utils.py
+++ b/client/tools/rhncfg/config_common/utils.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -48,7 +48,7 @@ def path_full_split(path):
components (as opposed to os.path.split which splits it into
trailing component and preceeding path
"""
-
+
path = normalize_path(path)
splitpath = []
while 1:
@@ -68,7 +68,7 @@ def copyfile_p(src, dst):
Simple util function, copies src path to dst path, making
directories as necessary. File permissions are not preserved.
"""
-
+
directory = os.path.split(dst)[0]
try:
os.makedirs(directory)
@@ -91,7 +91,7 @@ def copyfile_p(src, dst):
def mkdir_p(path, mode=None, symlinks=None, allfiles=None):
"""
Similar to 'mkdir -p' -- makes all directories necessary to ensure
- the 'path' is a directory, and return the list of directories that were
+ the 'path' is a directory, and return the list of directories that were
made as a result
"""
if not mode:
@@ -121,9 +121,9 @@ def mkdir_p(path, mode=None, symlinks=None, allfiles=None):
dirs_created.append(d)
log_debug(6, "dirs_created:",dirs_created)
-
+
return dirs_created
-
+
def rmdir_p(path, stoppath):
"""
if rmdir had a -p option, this would be it. remove dir and up
@@ -140,7 +140,7 @@ def rmdir_p(path, stoppath):
if path[:len(stoppath)] != stoppath:
raise OSError, "Could not remove %s: %s is not a prefix" % (
path, stoppath)
-
+
while 1:
if stoppath == path:
# We're done
@@ -157,7 +157,7 @@ def rmdir_p(path, stoppath):
if current == '':
# We're done - reached the root
break
-
+
#returns slashstring with any trailing slash removed
def rm_trailing_slash(slashstring):
if slashstring[-1] == "/":
@@ -180,7 +180,7 @@ def sha1_file(filename):
def parse_url(server_url, scheme="https"):
return urlparse.urlparse(server_url, scheme=scheme)
-
+
def unparse_url(url_tuple):
return urlparse.urlunparse(url_tuple)
diff --git a/client/tools/rhncfg/config_management/__init__.py \
b/client/tools/rhncfg/config_management/__init__.py index fb3600e..3830a2a 100644
--- a/client/tools/rhncfg/config_management/__init__.py
+++ b/client/tools/rhncfg/config_management/__init__.py
@@ -7,9 +7,9 @@
# 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.
+# in this software or its documentation.
#
diff --git a/client/tools/rhncfg/config_management/rhncfg-manager.py \
b/client/tools/rhncfg/config_management/rhncfg-manager.py index 4dc2b34..dd1258c \
100644
--- a/client/tools/rhncfg/config_management/rhncfg-manager.py
+++ b/client/tools/rhncfg/config_management/rhncfg-manager.py
@@ -8,10 +8,10 @@
# 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.
+# in this software or its documentation.
#
RHNROOT = '/usr/share/rhn'
diff --git a/client/tools/rhncfg/config_management/rhncfg_add.py \
b/client/tools/rhncfg/config_management/rhncfg_add.py index ded48ed..1f30139 100644
--- a/client/tools/rhncfg/config_management/rhncfg_add.py
+++ b/client/tools/rhncfg/config_management/rhncfg_add.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -53,7 +53,7 @@ class Handler(handler_base.HandlerBase):
help="Overwrite the SELinux context",
),
]
-
+
def run(self):
log_debug(2)
@@ -79,7 +79,7 @@ class Handler(handler_base.HandlerBase):
die(7, "--dest-file accepts a single file")
if not (self.options.dest_file[0] == os.sep):
die(7, "--dest-file argument must begin with " + os.sep)
- files_to_push.append((files[0], self.options.dest_file))
+ files_to_push.append((files[0], self.options.dest_file))
elif self.options.topdir:
if not os.path.isdir(self.options.topdir):
die(8, "--topdir specified, but `%s' not a directory" %
@@ -95,11 +95,11 @@ class Handler(handler_base.HandlerBase):
files_to_push.append((f, f[len(self.options.topdir):]))
else:
for f in files:
- #if a file is given w/o a full path, then use the abspath of the
+ #if a file is given w/o a full path, then use the abspath of the
#file as name of the file to be uploaded into the channel
if not (f[0] == os.sep):
files_to_push.append((f, os.path.abspath(f)))
- else:
+ else:
files_to_push.append((f, f))
for (local_file, remote_file) in files_to_push:
@@ -118,10 +118,10 @@ class Handler(handler_base.HandlerBase):
selinux_ctx = None
if type(self.options.selinux_context) != None:
selinux_ctx = self.options.selinux_context
-
+
for (local_file, remote_file) in files_to_push:
try:
- r.put_file(channel, remote_file, local_file,
+ r.put_file(channel, remote_file, local_file,
is_first_revision=self.is_first_revision,
delim_startÞlim_start,
delim_endÞlim_end,
diff --git a/client/tools/rhncfg/config_management/rhncfg_create_channel.py \
b/client/tools/rhncfg/config_management/rhncfg_create_channel.py index \
1dcfefb..5626b39 100644
--- a/client/tools/rhncfg/config_management/rhncfg_create_channel.py
+++ b/client/tools/rhncfg/config_management/rhncfg_create_channel.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
from config_common import handler_base, cfg_exceptions
diff --git a/client/tools/rhncfg/config_management/rhncfg_diff.py \
b/client/tools/rhncfg/config_management/rhncfg_diff.py index d8a2e3a..aaf6077 100644
--- a/client/tools/rhncfg/config_management/rhncfg_diff.py
+++ b/client/tools/rhncfg/config_management/rhncfg_diff.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import base64
@@ -132,7 +132,7 @@ class Handler(handler_base.HandlerBase):
src_link = info['symlink']
dest_link = os.readlink(local_file)
if src_link != os.readlink(local_file):
- return "Symbolic links differ. Channel: '%s' -> '%s' System: '%s' \
-> '%s' \n " % (path,src_link, path, dest_link) + return "Symbolic \
links differ. Channel: '%s' -> '%s' System: '%s' -> '%s' \n " % (path,src_link, \
path, dest_link) return ""
fromlines = info['file_contents'].splitlines(1)
tolines = open(local_file, 'r').readlines()
diff --git a/client/tools/rhncfg/config_management/rhncfg_diff_revisions.py \
b/client/tools/rhncfg/config_management/rhncfg_diff_revisions.py index \
9b0e17a..4a9f020 100644
--- a/client/tools/rhncfg/config_management/rhncfg_diff_revisions.py
+++ b/client/tools/rhncfg/config_management/rhncfg_diff_revisions.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import sys
@@ -76,5 +76,5 @@ class Handler(handler_base.HandlerBase):
die(2, e[0])
except cfg_exceptions.BinaryFileDiffError, e:
die(3, e[0])
-
+
sys.stdout.write(result)
diff --git a/client/tools/rhncfg/config_management/rhncfg_download_channel.py \
b/client/tools/rhncfg/config_management/rhncfg_download_channel.py index \
28b29d6..5978074 100644
--- a/client/tools/rhncfg/config_management/rhncfg_download_channel.py
+++ b/client/tools/rhncfg/config_management/rhncfg_download_channel.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -32,18 +32,18 @@ class Handler(handler_base.HandlerBase):
def run(self):
log_debug(2)
r = self.repository
-
+
if not self.args:
die(6, "No config channels specified")
-
+
topdir = self.options.topdir
if not topdir:
die(7, "--topdir not specified")
-
+
if not os.path.isdir(topdir):
die(8, "--topdir specified, but `%s' not a directory" %
topdir)
-
+
for ns in self.args:
if not r.config_channel_exists(ns):
die(6, "Error: config channel %s does not exist" % ns)
diff --git a/client/tools/rhncfg/config_management/rhncfg_get.py \
b/client/tools/rhncfg/config_management/rhncfg_get.py index 5c6f9a0..43ba6d7 100644
--- a/client/tools/rhncfg/config_management/rhncfg_get.py
+++ b/client/tools/rhncfg/config_management/rhncfg_get.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -42,7 +42,7 @@ class Handler(handler_base.HandlerBase):
help="Get this file revision",
),
]
-
+
def run(self):
log_debug(2)
r = self.repository
@@ -74,17 +74,17 @@ class Handler(handler_base.HandlerBase):
for f in self.args:
try:
directory = topdir or tempfile.gettempdir()
-
+
#5/11/05 wregglej - 157066 dirs_created is returned from \
get_file_info.
(temp_file, info, dirs_created) = r.get_file_info(channel, f, \
revision=revision,
auto_delete=0, \
dest_directory=directory)
-
+
except cfg_exceptions.RepositoryFileMissingError:
if revision is not None:
die(2, "Error: file %s (revision %s) not in config "
"channel %s" % (f, revision, channel))
else:
- die(2, "Error: file %s not in config channel %s" %
+ die(2, "Error: file %s not in config channel %s" %
(f, channel))
if topdir:
@@ -93,7 +93,7 @@ class Handler(handler_base.HandlerBase):
continue
elif info.get('filetype') == 'symlink':
print "%s -> %s" % (info['path'], info['symlink'])
- continue
+ continue
elif info.get('filetype') == 'directory':
print "%s is a directory entry, nothing to get" % info['path']
continue
@@ -117,5 +117,5 @@ class Handler(handler_base.HandlerBase):
raise
else:
raise e, "Deploy failed, rollback successful: ", \
sys.exc_info()[2]
-
+
diff --git a/client/tools/rhncfg/config_management/rhncfg_list.py \
b/client/tools/rhncfg/config_management/rhncfg_list.py index c03e716..4997cce 100644
--- a/client/tools/rhncfg/config_management/rhncfg_list.py
+++ b/client/tools/rhncfg/config_management/rhncfg_list.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
from config_common import handler_base
@@ -26,7 +26,7 @@ class Handler(handler_base.HandlerBase):
die(5, "Exactly one argument required")
channel = self.args[0]
-
+
print "Files in config channel '%s':" % channel
files = r.list_files(channel)
diff --git a/client/tools/rhncfg/config_management/rhncfg_list_channels.py \
b/client/tools/rhncfg/config_management/rhncfg_list_channels.py index \
8555d63..9f49a2e 100644
--- a/client/tools/rhncfg/config_management/rhncfg_list_channels.py
+++ b/client/tools/rhncfg/config_management/rhncfg_list_channels.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
from config_common import handler_base
diff --git a/client/tools/rhncfg/config_management/rhncfg_remove.py \
b/client/tools/rhncfg/config_management/rhncfg_remove.py index edc91cc..affff9a \
100644
--- a/client/tools/rhncfg/config_management/rhncfg_remove.py
+++ b/client/tools/rhncfg/config_management/rhncfg_remove.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -20,7 +20,7 @@ import xmlrpclib
class Handler(handler_base.HandlerBase):
_usage_options = "[options] file [ file ... ]"
-
+
_options_table = handler_base.HandlerBase._options_table + [
handler_base.HandlerBase._option_class(
'-c', '--channel', action="store",
diff --git a/client/tools/rhncfg/config_management/rhncfg_remove_channel.py \
b/client/tools/rhncfg/config_management/rhncfg_remove_channel.py index \
b6b73df..429c945 100644
--- a/client/tools/rhncfg/config_management/rhncfg_remove_channel.py
+++ b/client/tools/rhncfg/config_management/rhncfg_remove_channel.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
from config_common import handler_base, cfg_exceptions
@@ -32,6 +32,6 @@ class Handler(handler_base.HandlerBase):
except cfg_exceptions.ConfigChannelNotInRepo:
die("Config channel %s does not exist" % config_channel)
except cfg_exceptions.ConfigChannelNotEmptyError:
- die("Could not remove non-empty config channel %s" %
+ die("Could not remove non-empty config channel %s" %
config_channel)
print "Config channel %s removed" % config_channel
diff --git a/client/tools/rhncfg/config_management/rhncfg_revisions.py \
b/client/tools/rhncfg/config_management/rhncfg_revisions.py index 1bf2105..58d43fc \
100644
--- a/client/tools/rhncfg/config_management/rhncfg_revisions.py
+++ b/client/tools/rhncfg/config_management/rhncfg_revisions.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import string
@@ -41,7 +41,7 @@ class Handler(handler_base.HandlerBase):
print "Analyzing files in config channel %s" % channel
for f in self.args:
if not r.has_file(channel, f):
- die(8, "Config channel %s does not contain file %s" %
+ die(8, "Config channel %s does not contain file %s" %
(channel, f))
try:
revisions = r.get_file_revisions(channel, f)
diff --git a/client/tools/rhncfg/config_management/rhncfg_update.py \
b/client/tools/rhncfg/config_management/rhncfg_update.py index a85bbea..24fbbf9 \
100644
--- a/client/tools/rhncfg/config_management/rhncfg_update.py
+++ b/client/tools/rhncfg/config_management/rhncfg_update.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import rhncfg_add
diff --git a/client/tools/rhncfg/config_management/rhncfg_upload_channel.py \
b/client/tools/rhncfg/config_management/rhncfg_upload_channel.py index \
743616e..dec55f1 100644
--- a/client/tools/rhncfg/config_management/rhncfg_upload_channel.py
+++ b/client/tools/rhncfg/config_management/rhncfg_upload_channel.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -47,17 +47,17 @@ class Handler(handler_base.HandlerBase):
log_debug(2)
#5/12/05 wregglej - 149034 changed r into a instance variable
self.r = self.repository
-
+
topdir = self.options.topdir
if not topdir:
die(7, "--topdir not specified")
-
+
if not os.path.isdir(topdir):
die(8, "--topdir specified, but `%s' not a directory" %
topdir)
topdir = utils.normalize_path(topdir)
-
+
#5/12/05 wregglej - 149034 allowing the channel name and the directory name \
to vary independently. if not self.options.channel is None:
#Get the list of channels with leading and trailing whitespace removed.
@@ -79,7 +79,7 @@ class Handler(handler_base.HandlerBase):
dirs = None
#If dirs isn't None, then each directory needs to be uploaded into each \
channel.
- if dirs:
+ if dirs:
for channel in channels:
for directory in dirs:
self.upload_config_channel(topdir, channel, directory)
@@ -103,7 +103,7 @@ class Handler(handler_base.HandlerBase):
if not os.path.exists(channel_dir):
die(6, "Error: channel directory %s does not exist" % channel_dir)
-
+
flist = list_files_recursive(channel_dir)
for (dirname, filenames) in flist:
@@ -113,7 +113,7 @@ class Handler(handler_base.HandlerBase):
for f in filenames:
local_file = utils.join_path(dirname, f)
remote_file = utils.join_path(remote_dirname, f)
-
+
print "Uploading %s from %s" % (remote_file, local_file)
try:
self.r.put_file(channel, remote_file, local_file, \
is_first_revision=0, @@ -121,7 +121,7 @@ class Handler(handler_base.HandlerBase):
except cfg_exceptions.RepositoryFilePushError, e:
log_error(e)
-
+
def is_file_or_link(dirname, basename):
return os.path.isfile(os.path.join(dirname, basename)) or \
os.path.islink(os.path.join(dirname, basename))
diff --git a/client/tools/rhncfg/config_management/rpc_repository.py \
b/client/tools/rhncfg/config_management/rpc_repository.py index eba10b9..b1c8a32 \
100644
--- a/client/tools/rhncfg/config_management/rpc_repository.py
+++ b/client/tools/rhncfg/config_management/rpc_repository.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -40,9 +40,9 @@ class Repository(repository.RPC_Repository):
if not self.session and not (username and password):
raise cfg_exceptions.InvalidSession()
-
+
if self.session and not username:
- test = self.rpc_call('config.test_session',
+ test = self.rpc_call('config.test_session',
{'session' : self.session})
if not test:
raise cfg_exceptions.InvalidSession('Session is either expired or \
invalid') @@ -67,7 +67,7 @@ class Repository(repository.RPC_Repository):
if not self.session:
raise cfg_exceptions.InvalidSession
-
+
self.assert_repo_health()
@@ -109,11 +109,11 @@ class Repository(repository.RPC_Repository):
if auto_delete:
self.files_to_delete.append(fullpath)
-
+
del result['file_contents']
return fullpath, result, dirs_created
-
+
def has_file(self, config_channel, repopath):
params = {
@@ -122,7 +122,7 @@ class Repository(repository.RPC_Repository):
'path' : repopath,
}
return self.rpc_call('config.management.has_file', params)
-
+
def remove_file(self, config_channel, repopath):
""" remove a given file from the repo """
log_debug(4)
@@ -133,8 +133,8 @@ class Repository(repository.RPC_Repository):
}
return self.rpc_call('config.management.remove_file', params)
- def put_file(self, config_channel, repopath, localfile=None,
- is_first_revision=None, old_revision=None, delim_start=None,
+ def put_file(self, config_channel, repopath, localfile=None,
+ is_first_revision=None, old_revision=None, delim_start=None,
delim_end=None, selinux_ctx=None):
"""
Insert a given file into the repo, overwriting if necessary.
@@ -148,7 +148,7 @@ class Repository(repository.RPC_Repository):
max_file_size = self.get_maximum_file_size()
if params['size'] > max_file_size:
- error_msg = "%s too large (%s bytes, %s bytes max allowed)"
+ error_msg = "%s too large (%s bytes, %s bytes max allowed)"
raise cfg_exceptions.ConfigFileTooLargeError(error_msg % (localfile, \
params['size'], max_file_size))
if selinux_ctx is not None:
@@ -167,35 +167,35 @@ class Repository(repository.RPC_Repository):
try:
result = self.rpc_call('config.management.put_file', params)
-
+
except xmlrpclib.Fault, e:
fault_code, fault_string = e.faultCode, e.faultString
-
+
if is_first_revision and fault_code == -4013:
raise cfg_exceptions.RepositoryFileExistsError(fault_string), None, \
sys.exc_info()[2]
-
+
if old_revision and fault_code == -4012:
raise \
cfg_exceptions.RepositoryFileVersionMismatchError(fault_string), None, \
sys.exc_info()[2]
-
+
if fault_code == -4003:
raise cfg_exceptions.ConfigFileTooLargeError(fault_string), None, \
sys.exc_info()[2]
-
+
if fault_code == -4014:
raise cfg_exceptions.QuotaExceeded(fault_string), None, \
sys.exc_info()[2]
-
+
raise cfg_exceptions.RepositoryFilePushError(fault_code, fault_string), \
None, sys.exc_info()[2]
-
+
return result
-
+
def config_channel_exists(self, config_channel):
log_debug(4, config_channel)
return (config_channel in self.list_config_channels())
-
+
def list_files(self, config_channel, repopath = None, recurse = 1):
- """
- list files in a repo, recursing if requested;
- repopath is not used yet
+ """
+ list files in a repo, recursing if requested;
+ repopath is not used yet
"""
log_debug(4)
files = self.rpc_call('config.management.list_files',
@@ -229,18 +229,18 @@ class Repository(repository.RPC_Repository):
log_debug(4)
if hasattr(self, 'config_channels'):
return self.config_channels
-
+
self.config_channels = self.rpc_call(
'config.management.list_config_channels', {'session' : self.session}
) or []
return self.config_channels
-
+
def create_config_channel(self, config_channel):
"creates a configuration channel"
log_debug(4, config_channel)
try:
- return self.rpc_call('config.management.create_config_channel',
+ return self.rpc_call('config.management.create_config_channel',
{'session' : self.session, 'config_channel' : config_channel})
except xmlrpclib.Fault, e:
if e.faultCode == -4010:
@@ -251,7 +251,7 @@ class Repository(repository.RPC_Repository):
"Removes a configuration channel"
log_debug(4, config_channel)
try:
- return self.rpc_call('config.management.remove_config_channel',
+ return self.rpc_call('config.management.remove_config_channel',
{'session' : self.session, 'config_channel' : config_channel})
except xmlrpclib.Fault, e:
if e.faultCode == -4009:
@@ -259,7 +259,7 @@ class Repository(repository.RPC_Repository):
if e.faultCode == -4005:
raise cfg_exceptions.ConfigChannelNotEmptyError(config_channel), \
None, sys.exc_info()[2] raise
-
+
def _get_default_delimiters(self):
"retrieves the default delimiters from the server"
log_debug(4)
@@ -273,12 +273,12 @@ class Repository(repository.RPC_Repository):
result = self.rpc_call('config.management.get_maximum_file_size',
{'session' : self.session})
return result
-
+
def assert_repo_health(self):
log_debug(4)
pass
-
- def diff_file_revisions(self, path, config_channel_src, revision_src,
+
+ def diff_file_revisions(self, path, config_channel_src, revision_src,
config_channel_dst, revision_dst):
log_debug(4)
params = {
@@ -332,7 +332,7 @@ class Repository(repository.RPC_Repository):
os.unlink(p)
except OSError:
pass
-
+
def _get_session_path(self):
return os.path.join(utils.get_home_dir(), self._session_file)
diff --git a/client/tools/rhncfg/test/test_action_deploy.py \
b/client/tools/rhncfg/test/test_action_deploy.py index 75e3f5b..1b620b6 100644
--- a/client/tools/rhncfg/test/test_action_deploy.py
+++ b/client/tools/rhncfg/test/test_action_deploy.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -26,7 +26,7 @@ def test(msg, test):
ok_str = 'NOT OK'
if test:
ok_str = 'ok'
-
+
print "%s: %s" % (msg, ok_str)
def stray_files(path):
@@ -58,7 +58,7 @@ files = { 'files' : [
try:
for file in files['files']:
os.unlink(file['path'])
-
+
except OSError:
pass
diff --git a/client/tools/rhncfg/test/test_action_diff.py \
b/client/tools/rhncfg/test/test_action_diff.py index 66cead7..38534b6 100644
--- a/client/tools/rhncfg/test/test_action_diff.py
+++ b/client/tools/rhncfg/test/test_action_diff.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
from actions import configfiles
diff --git a/client/tools/rhncfg/test/test_action_script.py \
b/client/tools/rhncfg/test/test_action_script.py index 04a68c8..bb9ddbc 100644
--- a/client/tools/rhncfg/test/test_action_script.py
+++ b/client/tools/rhncfg/test/test_action_script.py
@@ -8,10 +8,10 @@
# 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.
+# in this software or its documentation.
#
from actions import script
diff --git a/client/tools/rhncfg/test/test_action_upload.py \
b/client/tools/rhncfg/test/test_action_upload.py index 567307e..b583e74 100644
--- a/client/tools/rhncfg/test/test_action_upload.py
+++ b/client/tools/rhncfg/test/test_action_upload.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
from actions import configfiles
diff --git a/client/tools/rhncfg/test/test_maketemp.py \
b/client/tools/rhncfg/test/test_maketemp.py index d1816f6..26799ce 100644
--- a/client/tools/rhncfg/test/test_maketemp.py
+++ b/client/tools/rhncfg/test/test_maketemp.py
@@ -8,10 +8,10 @@
# 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.
+# in this software or its documentation.
#
import os
diff --git a/client/tools/rhncfg/test/test_upload.py \
b/client/tools/rhncfg/test/test_upload.py index 216a42a..ddba255 100644
--- a/client/tools/rhncfg/test/test_upload.py
+++ b/client/tools/rhncfg/test/test_upload.py
@@ -8,10 +8,10 @@
# 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.
+# in this software or its documentation.
#
from rhn import rpclib
diff --git a/client/tools/rhncustominfo/rhn-custom-info.py \
b/client/tools/rhncustominfo/rhn-custom-info.py index d6ee549..6beb084 100755
--- a/client/tools/rhncustominfo/rhn-custom-info.py
+++ b/client/tools/rhncustominfo/rhn-custom-info.py
@@ -8,10 +8,10 @@
# 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.
+# in this software or its documentation.
#
@@ -33,24 +33,24 @@ from up2date_client import up2dateAuth
def create_server_obj(server_url):
cfg = config.initUp2dateConfig()
-
+
enable_proxy = cfg['enableProxy']
proxy_host = None
proxy_user = None
proxy_password = None
-
+
if enable_proxy:
proxy_host = config.getProxySetting()
if cfg['enableProxyAuth']:
proxy_user = cfg['proxyUser']
proxy_password = cfg['proxyPassword']
-
+
ca = cfg['sslCACert']
-
+
if isinstance(ca, basestring):
ca = [ca]
-
+
ca_certs = ca or ["/usr/share/rhn/RHNS-CA-CERT"]
lang = None
@@ -68,14 +68,14 @@ def create_server_obj(server_url):
proxy=proxy_host,
username=proxy_user,
password=proxy_password)
-
+
if lang:
server.setlang(lang)
-
+
for ca_cert in ca_certs:
if not os.access(ca_cert, os.R_OK):
raise "could not find cert %s" % ca_cert
-
+
server.add_trusted_cert(ca_cert)
return server
@@ -97,7 +97,7 @@ def read_username():
def system_exit(code, msgs=None):
"Exit with a code and optional message(s). Saved a few lines of code."
-
+
if msgs:
if type(msgs) not in [type([]), type(())]:
msgs = (msgs, )
@@ -155,7 +155,7 @@ def get_sys_id():
if not sysid_xml:
system_exit(1, "Could not get RHN systemid")
-
+
m = search('ID-(?P<sysid>[0-9]+)', sysid_xml)
if m:
@@ -187,12 +187,12 @@ def main():
url = munge_server_url(config.getServerlURL()[0])
s = create_server_obj(url)
-
+
sid = get_sys_id()
if not sid:
system_exit(1, "Could not determine systemid")
-
+
try:
session = s.auth.login(options.username, options.password)
@@ -218,12 +218,12 @@ def main():
print "%s\t%s" % (key, ret[key])
system_exit(0, None)
-
+
else:
if ret:
system_exit(0, None);
else:
system_exit(1, "Unknown failure!\n")
-
+
if __name__ == "__main__":
main()
diff --git a/client/tools/rhnpush/__init__.py b/client/tools/rhnpush/__init__.py
index fb3600e..3830a2a 100644
--- a/client/tools/rhnpush/__init__.py
+++ b/client/tools/rhnpush/__init__.py
@@ -7,9 +7,9 @@
# 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.
+# in this software or its documentation.
#
diff --git a/client/tools/rhnpush/archive.py b/client/tools/rhnpush/archive.py
index 65c7bd3..f66cbda 100644
--- a/client/tools/rhnpush/archive.py
+++ b/client/tools/rhnpush/archive.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
"""Archive Parsing module"""
@@ -121,14 +121,14 @@ class ArchiveParser(object):
if os.path.isdir(path):
p_contents = os.listdir(path)
e_contents = [os.path.join(entry, e) for e in p_contents]
- # this really is something of a hack, the newest contents will
- # 'prepended' to the queue instead of 'appended' changing the
- # search into depth-first when I think breadth-first would be
+ # this really is something of a hack, the newest contents will
+ # 'prepended' to the queue instead of 'appended' changing the
+ # search into depth-first when I think breadth-first would be
# the expected behavior
- # that's what we get for programming in python which doesn't
+ # that's what we get for programming in python which doesn't
# supply a nice way of adding real data-structure support
- # I already tried extending e_contents with contents and then
- # reassigning the contents reference to e_contents, but the
+ # I already tried extending e_contents with contents and then
+ # reassigning the contents reference to e_contents, but the
# damn while loop still had a hold of the original reference
contents.extend(e_contents)
else:
diff --git a/client/tools/rhnpush/connection.py b/client/tools/rhnpush/connection.py
index b82e4c3..435b690 100644
--- a/client/tools/rhnpush/connection.py
+++ b/client/tools/rhnpush/connection.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import socket
@@ -113,7 +113,7 @@ class PackageUpload:
self.connection.connect()
except socket.error, e:
raise ConnectionError("Error connecting", str(e)), None, \
sys.exc_info()[2]
-
+
# Add content_length
if not self.headers.has_key('Content-Length') and \
content_length is not None:
@@ -161,7 +161,7 @@ class PackageUpload:
"""
Uploads a file.
Returns (http_error_code, error_message)
- Sets:
+ Sets:
self.package_name
self.package_epoch
self.package_version
@@ -200,7 +200,7 @@ class PackageUpload:
# use the precomputed passed checksum
self.checksum_type = fileChecksumType
self.checksum = fileChecksum
-
+
# Set headers
self.set_header("Content-Type", "application/x-rpm")
self.set_header("User-Agent", self.user_agent)
@@ -216,7 +216,7 @@ class PackageUpload:
else:
self.set_header("%s-%s" % (prefix, "File-Checksum-Type"), \
self.checksum_type)
self.set_header("%s-%s" % (prefix, "File-Checksum"), self.checksum)
-
+
a_pkg.input_stream.seek(0, 0)
self._response = self.send_http('POST', stream_body=a_pkg.input_stream)
a_pkg.input_stream.close()
diff --git a/client/tools/rhnpush/rhnpush.py b/client/tools/rhnpush/rhnpush.py
index 1e7d93e..4f32dde 100755
--- a/client/tools/rhnpush/rhnpush.py
+++ b/client/tools/rhnpush/rhnpush.py
@@ -76,9 +76,9 @@ def main():
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( '--extended-test', action='store_true', help='Perform a more \
verbose test'),
- Option( '--no-session-caching', action='store_true',
+ Option( '--no-session-caching', action='store_true',
help='Disables session-token authentication.'),
- Option( '--tolerant', action='store_true',
+ Option( '--tolerant', action='store_true',
help='If rhnpush errors while uploading a package, continue uploading \
the rest of the packages.'),
Option( '--ca-chain', action='store', help='alternative SSL CA \
Cert') ]
@@ -92,7 +92,7 @@ def main():
optionParser = OptionParser(option_list=optionsTable, usage="%prog [OPTION] \
[<package>]") manager = rhnpush_confmanager.ConfManager(optionParser, true_list)
options = manager.get_config()
-
+
upload = UploadClass(options, files=options.files)
if options.usage:
@@ -124,7 +124,7 @@ def main():
if options.newest:
if not options.channel:
upload.die(1, "Must specify a channel for --newest to work")
-
+
upload.newest()
if not upload.files:
@@ -149,7 +149,7 @@ def main():
ret = upload.packages()
if ret != 0:
return 1
-
+
class UploadClass(uploadLib.UploadClass):
# pylint: disableá101,W0201
def __init__(self, options, files=None):
@@ -310,7 +310,7 @@ class UploadClass(uploadLib.UploadClass):
ping_status, errmsg, headerinfo = ping.ping()
self.warn(2, "Result codes:", ping_status, errmsg)
-
+
# move patch clusters to the end because all the patches in the cluster
# have to be pushed before the cluster itself
files1 = []
@@ -334,10 +334,10 @@ class UploadClass(uploadLib.UploadClass):
self.die(-1, "Pushing to Satellite < 4.1.0 is not supported.")
(server_digest_hash, pkgs_info, digest_hash) = self.check_package_exists()
-
+
for pkg in self.files:
ret = None #pkilambi:errors off as not initialized.this fixes it.
-
+
#temporary fix for picking pkgs instead of full paths
pkg_key = (pkg.strip()).split('/')[-1]
@@ -374,7 +374,7 @@ class UploadClass(uploadLib.UploadClass):
self.die(-1, msg)
self.warn(0, msg)
continue
-
+
for _t in range(0, tries):
try:
ret = self.package(pkg, checksum_type, checksum)
@@ -419,7 +419,7 @@ class UploadClass(uploadLib.UploadClass):
self.die(1, "Giving up after %d attempts" % tries)
else:
print "Giving up after %d attempts and continuing on..." % \
(tries,)
-
+
#5/13/05 wregglej - 154248 ?? we still want to add the packages if \
they're source. if ret and self.channels: # and ret['arch'] != 'src':
# Don't bother to add the package if
@@ -435,7 +435,7 @@ class UploadClass(uploadLib.UploadClass):
}
if self.orgId == '' or self.orgId > 0:
info['orgId'] = self.orgId
-
+
#2/3/06 wregglej 173287 Added check to see if we can use session tokens.
if channel_packages:
self.authenticate()
@@ -448,8 +448,8 @@ class UploadClass(uploadLib.UploadClass):
self.warn(2, "Computing checksum and package info. This may take some time \
...") pkg_hash = {}
digest_hash = {}
-
- for pkg in self.files:
+
+ for pkg in self.files:
pkg_info = {}
pkg_key = (pkg.strip()).split('/')[-1]
@@ -472,10 +472,10 @@ class UploadClass(uploadLib.UploadClass):
self.die(-1, "ERROR: %s: No such file or directory available" % \
pkg)
self.warn(2, "ERROR: %s: No such file or directory available" % pkg)
continue
-
+
digest_hash[pkg_key] = (a_pkg.checksum_type, a_pkg.checksum)
a_pkg.input_stream.close()
-
+
for tag in ('name', 'version', 'release', 'epoch', 'arch'):
val = a_pkg.header[tag]
if val is None:
@@ -485,7 +485,7 @@ class UploadClass(uploadLib.UploadClass):
#instead of checking arch in header
if a_pkg.header.is_source:
if not self.options.source:
- self.die(-1, "ERROR: Trying to Push src rpm, Please re-try with \
--source.") + self.die(-1, "ERROR: Trying to Push src rpm, Please \
re-try with --source.") if RPMTAG_NOSOURCE in a_pkg.header.keys():
pkg_info['arch'] = 'nosrc'
else:
@@ -499,7 +499,7 @@ class UploadClass(uploadLib.UploadClass):
orgid = 'null'
else:
orgid = ''
-
+
info = {
'packages' : pkg_hash,
'channels' : self.channels,
@@ -549,9 +549,9 @@ class UploadClass(uploadLib.UploadClass):
packaging = h.packaging
else:
packaging = 'rpm'
-
+
if packaging == 'rpm' and self.options.nosig is None and not h.is_signed():
- #pkilambi:bug#173886:force exit to check for sig if --nosig
+ #pkilambi:bug#173886:force exit to check for sig if --nosig
raise uploadLib.UploadError("ERROR: %s: unsigned rpm (use --nosig to \
force)"% package)
try:
@@ -619,10 +619,10 @@ class UploadClass(uploadLib.UploadClass):
if status == 403:
#auth expired raise an exception to grab one
raise AuthenticationRequired()
-
+
if status != 200:
self.die(1, "Error pushing %s: %s (%s)" % (package, msgstr, status))
-
+
return ret
class AuthenticationRequired(Exception):
diff --git a/client/tools/rhnpush/rhnpush_cache.py \
b/client/tools/rhnpush/rhnpush_cache.py index 4e145b9..1344a1d 100644
--- a/client/tools/rhnpush/rhnpush_cache.py
+++ b/client/tools/rhnpush/rhnpush_cache.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
# rhnpush_cache.py
#
@@ -20,7 +20,7 @@
# UserInfo - Instantiations of this class are pickled.
# Cache won't be valid after a certain amount of time.
#
-# CacheManager - Controls access to the cache.
+# CacheManager - Controls access to the cache.
import utils
import os
diff --git a/client/tools/rhnpush/rhnpush_config.py \
b/client/tools/rhnpush/rhnpush_config.py index db5f96d..b829f6b 100644
--- a/client/tools/rhnpush/rhnpush_config.py
+++ b/client/tools/rhnpush/rhnpush_config.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
#
#The configuration file parser for the rhnpush utility.
@@ -30,7 +30,7 @@ class rhnpushConfigParser:
_instance = None
def __init__(self, filename=None, ensure_consistencyúlse):
-
+
#Defaults that are used if the ensure_consistency parameter of the \
constructor is true #and the config file that is being read is missing some values.
self.options_defaults = {
@@ -56,32 +56,32 @@ class rhnpushConfigParser:
'cache_lifetime' : '600',
'new_cache' : '0',
'extended_test' : '0',
- 'no_session_caching' : '0',
+ 'no_session_caching' : '0',
'proxy' : '',
- 'tolerant' : '0',
+ 'tolerant' : '0',
'ca_chain' : \
'/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT',
}
#Used to parse the config file.
self.settings = ConfigParser.ConfigParser()
-
- #use options from the rhnpush section.
+
+ #use options from the rhnpush section.
self.section = "rhnpush"
self.username = None
- self.password = None
-
+ self.password = None
+
if filename:
self.filename = filename
self._read_config_files()
- #Take all of the options read from the configuration file and add them as \
attributes + #Take all of the options read from the configuration file and add \
them as attributes #(instance variables, member variables, whatever) of this object.
self._add_config_as_attr(ensure_consistency=ensure_consistency)
-
+
#Use the ConfigParser to read in the configuration file.
- def _read_config_files(self):
+ def _read_config_files(self):
try:
self.settings.read([self.filename])
except IOError, e:
@@ -123,19 +123,19 @@ class rhnpushConfigParser:
def __delitem__(self, item):
pass
-
+
def __len__(self, item):
pass
-
+
def __setitem__(self, item):
pass
-
+
#Takes all of the configuration options read in by the ConfigParser and makes \
them attributes of the object. def _add_config_as_attr(self, \
ensure_consistencyúlse): for k in self._keys():
self.__dict__[k] = self.settings.get(self.section, k)
- #ensuring consistency only checks for missing configuration option.
+ #ensuring consistency only checks for missing configuration option.
if ensure_consistency:
for thiskey in self.options_defaults.keys():
if not self.__dict__.has_key(thiskey):
diff --git a/client/tools/rhnpush/rhnpush_confmanager.py \
b/client/tools/rhnpush/rhnpush_confmanager.py index 94900dd..6c6209e 100644
--- a/client/tools/rhnpush/rhnpush_confmanager.py
+++ b/client/tools/rhnpush/rhnpush_confmanager.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import rhnpush_config
@@ -31,7 +31,7 @@ class ConfManager:
self.cfgFileList = [deffile, regfile, cwdfile]
self.defaultconfig = \
rhnpush_config.rhnpushConfigParser(ensure_consistency=True)
- #Get a reference to the object containing command-line options
+ #Get a reference to the object containing command-line options
self.cmdconfig = optionparser
self.store_true_list = store_true_list
@@ -62,7 +62,7 @@ class ConfManager:
self.defaultconfig, config2 = \
utils.make_common_attr_equal(self.defaultconfig, config2)
self._files_to_list()
-
+
#Change the channel string into a list of strings.
# pylint: disableá103
if not self.defaultconfig.channel:
@@ -72,25 +72,25 @@ class ConfManager:
else:
self.defaultconfig.channel = map(lambda x: x.strip(),
self.defaultconfig.channel.split(','))
-
+
#Get the command line arguments. These take precedence over the other \
settings argoptions, files = self.cmdconfig.parse_args()
-
+
#Makes self.defaultconfig compatible with argoptions by changing all '0' \
value attributes to None. _zero_to_none(self.defaultconfig, self.store_true_list)
-
+
#If verbose isn't set at the command-line, it automatically gets set to \
zero. If it's at zero, change it to #None so the settings in the config files take \
precedence. if argoptions.verbose == 0:
- argoptions.verbose = None
-
+ argoptions.verbose = None
+
#Orgid, count, cache_lifetime, and verbose all need to be integers, just \
like in argoptions. if self.defaultconfig.orgid:
self.defaultconfig.orgid = int(self.defaultconfig.orgid)
if self.defaultconfig.count:
self.defaultconfig.count = int(self.defaultconfig.count)
-
+
if self.defaultconfig.cache_lifetime:
self.defaultconfig.cache_lifetime = \
int(self.defaultconfig.cache_lifetime)
@@ -99,12 +99,12 @@ class ConfManager:
#Copy the settings in argoptions into self.defaultconfig.
self.defaultconfig, argoptions = \
utils.make_common_attr_equal(self.defaultconfig, argoptions)
-
+
#Make sure files is in the correct format.
if self.defaultconfig.files != files:
self.defaultconfig.files = files
- return self.defaultconfig
+ return self.defaultconfig
def _zero_to_none(config, store_true_list):
for opt in config.keys():
diff --git a/client/tools/rhnpush/rhnpush_v2.py b/client/tools/rhnpush/rhnpush_v2.py
index 3925590..cf95c34 100644
--- a/client/tools/rhnpush/rhnpush_v2.py
+++ b/client/tools/rhnpush/rhnpush_v2.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
#
diff --git a/client/tools/rhnpush/rpm2mpm.py b/client/tools/rhnpush/rpm2mpm.py
index df672bb..a85e4cd 100644
--- a/client/tools/rhnpush/rpm2mpm.py
+++ b/client/tools/rhnpush/rpm2mpm.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import sys
@@ -53,7 +53,7 @@ def rpm_to_mpm(header, file_stream):
'build_time' : 'buildtime',
'source_rpm' : 'sourcerpm',
}
-
+
tags = [
'name',
'epoch',
@@ -77,7 +77,7 @@ def rpm_to_mpm(header, file_stream):
'siggpg',
'sigsize',
]
-
+
result = {}
for t in tags:
tt = tag_map.get(t, t)
@@ -96,7 +96,7 @@ def rpm_to_mpm(header, file_stream):
# md5sum, package_size
file_stream.seek(0, 2)
- file_size = file_stream.tell()
+ file_size = file_stream.tell()
result['package_size'] = file_size
is_source = 0
@@ -110,7 +110,7 @@ def rpm_to_mpm(header, file_stream):
p = rhn_mpm.MPM_Package()
p.header = h
p.payload_stream = file_stream
-
+
return p
def _extract_files(header):
diff --git a/client/tools/rhnpush/solaris2mpm.py \
b/client/tools/rhnpush/solaris2mpm.py index 6072bcc..0d06adb 100644
--- a/client/tools/rhnpush/solaris2mpm.py
+++ b/client/tools/rhnpush/solaris2mpm.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
@@ -213,7 +213,7 @@ def _run(archives=sys.argv[1:]):
pkg_mpm = create_pkg_mpm(archive_parser, prefix=dirname)
write_mpm(pkg_mpm)
_close_mpm(pkg_mpm)
-
+
# don't know what the hell the customer is trying to run this on
else:
@@ -252,8 +252,8 @@ def _is_patch_archive(archive_parser):
def _is_package_archive(archive_parser):
"""[internal] Returns true iff the parser contains a patch archive"""
- # NOTE: this functions is just to determine that the content in the archive
- # is indeed Solaris content. This function witll also return True for
+ # NOTE: this functions is just to determine that the content in the archive
+ # is indeed Solaris content. This function witll also return True for
# patches and patch cluster, so this test needs to come last!
return archive_parser.contains("pkginfo")
@@ -439,7 +439,7 @@ def create_pkg_mpm(archive_parser, prefix=""):
header.update(dct)
# Provides ourself after the header has been updated with the dependency
- # info (if at all). This will prevent our own provides from being
+ # info (if at all). This will prevent our own provides from being
# overwritten.
provide_self(header)
@@ -504,7 +504,7 @@ def parse_pkginfo(pkginfo_str):
# header['release'] <-- release + [ "_PSTAMP_" + pstamp ]
#
def compose_pstamp_and_release(header):
-
+
release_part = ''
if header.has_key('release'):
release_part = str(header['release'])
@@ -814,7 +814,7 @@ def patch_list(patch_str, sense):
if patch_str.find('(') >= 0:
print "Unsupported patch list expression:", patch_str
return []
-
+
dct = { 'name' : None,
'version' : None,
'flags' : sense }
@@ -936,7 +936,7 @@ def _compute_pkg_name_extension(arch):
if dot_index == -1:
return None
- # Ok. The presence of a '.' in the arch means this is an arch-specific
+ # Ok. The presence of a '.' in the arch means this is an arch-specific
# package and we should return the appropriate extension.
specific_arch = arch[dot_index + 1:]
@@ -978,7 +978,7 @@ def _extract_pstamp_as_release(pstamp):
if pstamp is None:
raise PStampParseException("PSTAMP is null")
-
+
# Extract the last 12 characters from the pstamp. This will represent the
# date and time.
date_time_stamp = pstamp[-12:]
diff --git a/client/tools/rhnpush/test/testUtils.py \
b/client/tools/rhnpush/test/testUtils.py index 8de1f76..232d803 100644
--- a/client/tools/rhnpush/test/testUtils.py
+++ b/client/tools/rhnpush/test/testUtils.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import unittest
diff --git a/client/tools/rhnpush/test/test_archive.py \
b/client/tools/rhnpush/test/test_archive.py index e759d30..35b266c 100644
--- a/client/tools/rhnpush/test/test_archive.py
+++ b/client/tools/rhnpush/test/test_archive.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploadLib.py
index 0a0dfc3..31a2a2f 100644
--- a/client/tools/rhnpush/uploadLib.py
+++ b/client/tools/rhnpush/uploadLib.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
# system imports
@@ -222,7 +222,7 @@ class UploadClass:
self.setServer()
self.authenticate()
-
+
sources = self.options.source
if sources:
@@ -230,7 +230,7 @@ class UploadClass:
return self.get_newest_binary_packages()
-
+
def get_newest_binary_packages(self):
# Loop through the args and only keep the newest ones
localPackagesHash = {}
@@ -270,7 +270,7 @@ class UploadClass:
if skip_rpm:
# Older
continue
-
+
same_names_hash[nvrea] = filename
# Now get the list from the server
@@ -322,7 +322,7 @@ class UploadClass:
localPackagesHash = {}
for filename in self.files:
localPackagesHash[os.path.basename(filename)] = filename
-
+
# Now get the list from the server
pkglist = self._listMissingSourcePackages()
@@ -378,9 +378,9 @@ class UploadClass:
# set the server
self.setServer()
-
+
self.authenticate()
-
+
source = self.options.source
file_list = self._get_files()
@@ -388,7 +388,7 @@ class UploadClass:
chunk = file_list[:self.count]
del file_list[:self.count]
uploadedPackages, headersList = self._processBatch(chunk,
- relativeDir=self.relativeDir, source=self.options.source,
+ relativeDir=self.relativeDir, source=self.options.source,
verbose=self.options.verbose, nosig=self.options.nosig)
if not headersList:
@@ -461,7 +461,7 @@ class UploadClass:
else:
self.session = rhnpush_cache.RHNPushSession()
self.session.setSessionString(session)
-
+
if not self.options.no_session_caching:
self.session.writeSession()
@@ -648,7 +648,7 @@ def parseXMLRPCfault(fault):
def listChannel(server, username, password, channels):
return call(server.packages.listChannel, channels, username, password)
-def listChannelBySession(server, session_string, channels):
+def listChannelBySession(server, session_string, channels):
return call(server.packages.listChannelBySession, channels, session_string)
def listChannelSource(server, username, password, channels):
@@ -725,7 +725,7 @@ def get_header(filename, fildes=None, source=None):
h = get_package_header(filename=filename, fd=fildes)
except:
raise UploadError("Package is invalid"), None, sys.exc_info()[2]
-
+
# Verify that this is indeed a binary/source. xor magic
# xor doesn't work with None values, so compare the negated values - the
# results are identical
diff --git a/client/tools/spacewalk-koan/actions/kickstart.py \
b/client/tools/spacewalk-koan/actions/kickstart.py index f7eb4f3..df9ea5b 100644
--- a/client/tools/spacewalk-koan/actions/kickstart.py
+++ b/client/tools/spacewalk-koan/actions/kickstart.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import sys
@@ -27,7 +27,7 @@ __rhnexport__ = [
]
def initiate(kickstart_host, base, extra_append, static_device="", system_record="", \
preserve_files=[], cache_onlyúlse):
- log = up2dateLog.initLog()
+ log = up2dateLog.initLog()
log.log_me("initiating spacewalkkoan kickstart")
return spacewalkkoan.initiate(kickstart_host, base, extra_append=extra_append,
static_device=static_device, system_record=system_record, \
preserve_files=preserve_files)
diff --git a/client/tools/spacewalk-koan/actions/kickstart_guest.py \
b/client/tools/spacewalk-koan/actions/kickstart_guest.py index 2e35fed..ef8c8ff \
100644
--- a/client/tools/spacewalk-koan/actions/kickstart_guest.py
+++ b/client/tools/spacewalk-koan/actions/kickstart_guest.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import sys
@@ -56,7 +56,7 @@ def initiate(kickstart_host, cobbler_system_name, virt_type, \
ks_session_id, name \
###############################################################################
class KickstartLogNotifyHandler(BatchNotifyHandler):
-
+
def __init__(self, ks_session_id):
self.__ks_session_id = ks_session_id
self.__plan = None
diff --git a/client/tools/spacewalk-koan/spacewalkkoan/__init__.py \
b/client/tools/spacewalk-koan/spacewalkkoan/__init__.py index fb3600e..3830a2a 100644
--- a/client/tools/spacewalk-koan/spacewalkkoan/__init__.py
+++ b/client/tools/spacewalk-koan/spacewalkkoan/__init__.py
@@ -7,9 +7,9 @@
# 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.
+# in this software or its documentation.
#
diff --git a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py \
b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py index 0c5d991..22448d4 \
100644
--- a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
+++ b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
# Kickstart a system using koan.
#
@@ -35,7 +35,7 @@ def execute(cmd):
status = os.system(cmd + " > " + tmp)
data = open(tmp).readlines()
ret = []
- for l in data:
+ for l in data:
ret.append(string.strip(l))
if status == 0:
return ret
@@ -127,15 +127,15 @@ def initiate(kickstart_host, base, extra_append, \
static_device=None, system_reco
error_messages = {}
success = 0
-
+
# cleanup previous attempt
rm_rf(SHADOW)
os.mkdir(SHADOW)
-
+
print "Preserve files! : %s" % preserve_files
-
+
try:
- if static_device:
+ if static_device:
update_static_device_records(kickstart_host, static_device)
k = Koan()
@@ -187,9 +187,9 @@ def initiate(kickstart_host, base, extra_append, \
static_device=None, system_reco # Error
return ret
initrd = initrd + ".merged"
-
-
-
+
+
+
return (0, "Kickstart initiate succeeded", error_messages)
@@ -265,7 +265,7 @@ def initiate_guest(kickstart_host, cobbler_system_name, \
virt_type, name, mem_kb,
def create_new_rd(initrd, preserve_files=[]):
"""
- Returns None if everything went well, or a tuple
+ Returns None if everything went well, or a tuple
(err_code, err_string, dict) if problems were found
"""
if not initrd:
@@ -277,9 +277,9 @@ def create_new_rd(initrd, preserve_files=[]):
# lame naming below to use /tmp/ks-tres-shadow 2X
# but needed to get it here the ks.cfg expects it
preserve_shadow = SHADOW + SHADOW
- # new FileCopier class handles the dirty work of getting the
+ # new FileCopier class handles the dirty work of getting the
# preserved file set copied w/ all permissions, owners, etc
- # kept intact and in the correct location
+ # kept intact and in the correct location
c = FileCopier(preserve_files, preserve_shadow, quota=quota)
try:
c.copy()
@@ -313,7 +313,7 @@ def _remove_func(path):
# Attempt to remove the file/link/etc
os.unlink(path)
return
-
+
# It's a directory!
files = os.listdir(path)
# We need to add the path since listdir only returns a relative path
@@ -420,7 +420,7 @@ class FileCopier:
# Quota enabled
if self.current_quota + file_size > self.quota:
raise QuotaExceeded(f)
-
+
def _update_quota(self, f, file_size):
self.current_quota = self.current_quota + file_size
@@ -435,7 +435,7 @@ class FileCopier:
os.chmod(dest, st[stat.ST_MODE])
os.chown(dest, st[stat.ST_UID], st[stat.ST_GID])
os.utime(dest, (st[stat.ST_ATIME], st[stat.ST_MTIME]))
-
+
def _copy_dir(self, f, st):
files = map(lambda x, d=f: os.path.join(d, x), os.listdir(f))
@@ -479,7 +479,7 @@ class FileCopier:
for d in l:
src_dir = os.path.join(src_dir, d)
src_st = os.lstat(src_dir)
- dest_dir = os.path.join(dest_dir, d)
+ dest_dir = os.path.join(dest_dir, d)
if not os.path.exists(dest_dir):
os.mkdir(dest_dir)
os.chmod(dest_dir, src_st[stat.ST_MODE])
diff --git a/java/scripts/api/activationkeytests.py \
b/java/scripts/api/activationkeytests.py index 2e5f331..d739605 100644
--- a/java/scripts/api/activationkeytests.py
+++ b/java/scripts/api/activationkeytests.py
@@ -21,8 +21,8 @@ class ActivationKeyTests(RhnTestCase):
def create_key(self):
random_int = randint(1, 1000000)
self.key = "xmlrpckey_python" + str(random_int)
- self.key = client.activationkey.create(self.session_key, self.key,
- "xmlrpc test key " + str(random_int), BASE_CHANNEL_LABEL, 0,
+ self.key = client.activationkey.create(self.session_key, self.key,
+ "xmlrpc test key " + str(random_int), BASE_CHANNEL_LABEL, 0,
["provisioning_entitled"], False)
print "created key: %s" % self.key
return self.key
@@ -31,8 +31,8 @@ class ActivationKeyTests(RhnTestCase):
def test_create_new_key(self):
random_int = randint(1, 1000000)
key = "xmlrpckey" + str(random_int)
- newkey = client.activationkey.create(self.session_key, key,
- "xmlrpc test key " + str(random_int), BASE_CHANNEL_LABEL, 0,
+ newkey = client.activationkey.create(self.session_key, key,
+ "xmlrpc test key " + str(random_int), BASE_CHANNEL_LABEL, 0,
["provisioning_entitled"], False)
new_details = {}
@@ -49,7 +49,7 @@ class ActivationKeyTests(RhnTestCase):
self.assertEquals(BASE_CHANNEL_LABEL, new_details['base_channel_label'])
# Add some new entitlements:
- client.activationkey.addEntitlements(self.session_key, newkey,
+ client.activationkey.addEntitlements(self.session_key, newkey,
['monitoring_entitled', 'virtualization_host'])
client.activationkey.addChildChannels(self.session_key, newkey,
diff --git a/java/scripts/api/channelsoftwaretests.py \
b/java/scripts/api/channelsoftwaretests.py index 51db823..eacc434 100644
--- a/java/scripts/api/channelsoftwaretests.py
+++ b/java/scripts/api/channelsoftwaretests.py
@@ -147,7 +147,7 @@ class ChannelSoftware(RhnTestCase):
self.assertTrue(len(fromErrata) == len(toErrata))
self.assertTrue(fromErrata == toErrata)
- # attempt a second merge of the same errata and confirm that
+ # attempt a second merge of the same errata and confirm that
# there is no change to the errata in the 'to channel'...
# there shouldn't be since the channel already had those errata...
mergeResult = client.channel.software.mergeErrata(self.session_key, \
CHANNEL_LABEL, toChannelLabel)
diff --git a/java/scripts/api/cleanup.py b/java/scripts/api/cleanup.py
index b156732..2d2d34a 100755
--- a/java/scripts/api/cleanup.py
+++ b/java/scripts/api/cleanup.py
@@ -10,7 +10,7 @@ if False:
for i in range(0, len(list)):
t = list.pop()
print "deleting org: " + str(t['id'])
- try:
+ try:
if t['id'] != 1:
client.org.delete(key, t['id'])
except:
@@ -45,7 +45,7 @@ if False:
print "deleting group: " + i['name']
client.systemgroup.delete(key, i['name'])
-if True:
+if True:
list = client.kickstart.tree.list(key)
print list
for i in list:
@@ -57,7 +57,7 @@ if True:
list = client.channel.listSoftwareChannels(key)
for i in list:
print "deleting channel:" + i['name']
- try:
+ try:
client.channel.software.delete(key, i['label'])
except:
print sys.exc_info()[0]
diff --git a/java/scripts/api/kickstartimport.py \
b/java/scripts/api/kickstartimport.py index d5be5e0..829eba9 100644
--- a/java/scripts/api/kickstartimport.py
+++ b/java/scripts/api/kickstartimport.py
@@ -29,7 +29,7 @@ print " virtualization type: %s" % virt_type
print " kickstart tree label: %s" % ks_tree_label
print " kickstart file: %s" % ks_file
-client.kickstart.importKickstartFile(session_key, ks_label, virt_type,
+client.kickstart.importKickstartFile(session_key, ks_label, virt_type,
ks_tree_label, True, file_contents)
diff --git a/java/scripts/api/kickstarttests.py b/java/scripts/api/kickstarttests.py
index 333291f..92276af 100644
--- a/java/scripts/api/kickstarttests.py
+++ b/java/scripts/api/kickstarttests.py
@@ -194,10 +194,10 @@ class KickstartTests(RhnTestCase):
self.assertTrue(c.has_key('channel_summary'))
def test_list_kickstartable_trees(self):
- trees = client.kickstart.listKickstartableTrees(self.session_key,
+ trees = client.kickstart.listKickstartableTrees(self.session_key,
CHANNEL_LABEL)
# should be true on any satellite we're testing against
- self.assertTrue(len(trees) > 0)
+ self.assertTrue(len(trees) > 0)
for t in trees:
self.assertTrue(t.has_key('channel_id'))
self.assertTrue(t.has_key('boot_image'))
@@ -205,20 +205,20 @@ class KickstartTests(RhnTestCase):
self.assertTrue(t.has_key('label'))
def test_import(self):
- trees = client.kickstart.listKickstartableTrees(self.session_key,
+ trees = client.kickstart.listKickstartableTrees(self.session_key,
CHANNEL_LABEL)
# could fail if you ran it enough
- ks_label = "test-profile-%s" % random.randint(100, 999)
+ ks_label = "test-profile-%s" % random.randint(100, 999)
client.kickstart.importFile(self.session_key, ks_label, 'none',
- trees[0]['label'], False, KICKSTART_FILE)
+ trees[0]['label'], False, KICKSTART_FILE)
def test_create(self):
- trees = client.kickstart.listKickstartableTrees(self.session_key,
+ trees = client.kickstart.listKickstartableTrees(self.session_key,
CHANNEL_LABEL)
- ks_label = "api-created-%s" % random.randint(100, 999)
- client.kickstart.createProfile(self.session_key, ks_label,
+ ks_label = "api-created-%s" % random.randint(100, 999)
+ client.kickstart.createProfile(self.session_key, ks_label,
'none', trees[0]['label'], SATELLITE_HOST, 'rootpw')
diff --git a/java/scripts/api/ks-setup.py b/java/scripts/api/ks-setup.py
index 82e29dd..8d6f6fe 100644
--- a/java/scripts/api/ks-setup.py
+++ b/java/scripts/api/ks-setup.py
@@ -30,7 +30,7 @@ def setup(parser):
parser.add_option("-d","--distro", dest="distro",
defaultÞfault,
help="Rhel 5 Distro Path example \
[/engarchive/released/RHEL-5-Server/U3/i386/os] - default '%s'" % \
default)
-
+
default = os.path.join(os.path.abspath('.') , 'spacewalk-koan.rpm')
parser.add_option("-k","--koan", dest="koan",
defaultÞfault,
@@ -39,13 +39,13 @@ def setup(parser):
default = 'fedora'
parser.add_option("-p","--prefix", dest="prefix",
defaultÞfault,
- help="prefix for channel names/ activaiton key name \
etc] - default '%s'" % default) + help="prefix for \
channel names/ activaiton key name etc] - default '%s'" % default)
def main():
parser = optparse.OptionParser()
setup(parser)
(options, args) = parser.parse_args()
-
+
key = login()
#create custom channel
channel = uniquify(options.prefix)
@@ -57,7 +57,7 @@ def main():
#create activation key
- act_key = client.activationkey.create(key, uniquify(options.prefix.lower()),
+ act_key = client.activationkey.create(key, uniquify(options.prefix.lower()),
uniquify(options.prefix.title() + " Key"), channel, \
["provisioning_entitled"], False) print act_key
#create the distro
diff --git a/java/scripts/api/managechannel.py b/java/scripts/api/managechannel.py
index ca53e64..428c768 100644
--- a/java/scripts/api/managechannel.py
+++ b/java/scripts/api/managechannel.py
@@ -71,7 +71,7 @@ def pushContent(users, channels):
def main():
# Create Session keys
keys = getKeys(SATELLITE_LOGIN_HASH)
- # Create channels
+ # Create channels
channel_list = createChannels(keys, CHANNEL_INFO)
# push content to channels
pushContent(SATELLITE_LOGIN_HASH, channel_list)
diff --git a/java/scripts/api/orgtests.py b/java/scripts/api/orgtests.py
index 9d0b423..5029893 100644
--- a/java/scripts/api/orgtests.py
+++ b/java/scripts/api/orgtests.py
@@ -22,8 +22,8 @@ class OrgTests(RhnTestCase):
# Create a test org that will be deleted in teardown:
self.random_int = randint(1, 1000000)
self.org_name = "Test Org %s" % self.random_int
- self.org = client.org.create(self.session_key, self.org_name,
- "admin%s" % self.random_int, "password",
+ self.org = client.org.create(self.session_key, self.org_name,
+ "admin%s" % self.random_int, "password",
"Mr.", "Fake", "Admin", "fake@example.com", False)
self.org_id = self.org['id']
@@ -44,7 +44,7 @@ class OrgTests(RhnTestCase):
self.assertRaises(Exception, client.org.delete, self.session_key, -1)
def test_list_channel_family_entitlements(self):
- result = client.org.listSoftwareEntitlements(self.session_key,
+ result = client.org.listSoftwareEntitlements(self.session_key,
CHANNEL_FAMILY_LABEL)
self.assertTrue(len(result) >= 1) # default org at least
for counts in result:
@@ -56,7 +56,7 @@ class OrgTests(RhnTestCase):
def test_list_channel_family_entitlements_for_org(self):
# NOTE: Using the default org here:
- result = client.org.listSoftwareEntitlementsForOrg(self.session_key,
+ result = client.org.listSoftwareEntitlementsForOrg(self.session_key,
SATELLITE_ORG_ID)
for counts in result:
self.assertTrue(counts.has_key('label'))
@@ -91,7 +91,7 @@ class OrgTests(RhnTestCase):
def test_set_channel_family_entitlements(self):
# Lookup satellite org count for verification:
- result = client.org.listSoftwareEntitlementsForOrg(self.session_key,
+ result = client.org.listSoftwareEntitlementsForOrg(self.session_key,
SATELLITE_ORG_ID)
count = self.__find_count_for_entitlement(result, CHANNEL_FAMILY_LABEL)
sat_org_total = count['allocated']
@@ -101,25 +101,25 @@ class OrgTests(RhnTestCase):
self.org_id, CHANNEL_FAMILY_LABEL, 100)
self.assertEquals(1, result)
- result = client.org.listSoftwareEntitlementsForOrg(self.session_key,
+ result = client.org.listSoftwareEntitlementsForOrg(self.session_key,
self.org_id)
count = self.__find_count_for_entitlement(result, CHANNEL_FAMILY_LABEL)
self.assertEquals(100, count['allocated'])
# Check that the satellite org lost it's entitlements:
- result = client.org.listSoftwareEntitlementsForOrg(self.session_key,
+ result = client.org.listSoftwareEntitlementsForOrg(self.session_key,
SATELLITE_ORG_ID)
count = self.__find_count_for_entitlement(result, CHANNEL_FAMILY_LABEL)
self.assertEquals(sat_org_total - 100, count['allocated'])
def test_set_too_many_channel_family_entitlements(self):
- result = client.org.listSoftwareEntitlementsForOrg(self.session_key,
+ result = client.org.listSoftwareEntitlementsForOrg(self.session_key,
SATELLITE_ORG_ID)
count = self.__find_count_for_entitlement(result, CHANNEL_FAMILY_LABEL)
sat_org_free = count['free']
# Allocate one too many entitlements:
- result = self.assertRaises(Exception,
+ result = self.assertRaises(Exception,
client.org.setSoftwareEntitlements, self.session_key,
self.org_id, CHANNEL_FAMILY_LABEL, sat_org_free + 1)
@@ -137,9 +137,9 @@ class OrgTests(RhnTestCase):
def test_set_system_entitlements(self):
# Lookup satellite org count for verification:
- result = client.org.listSystemEntitlementsForOrg(self.session_key,
+ result = client.org.listSystemEntitlementsForOrg(self.session_key,
SATELLITE_ORG_ID)
- count = self.__find_count_for_entitlement(result,
+ count = self.__find_count_for_entitlement(result,
SYSTEM_ENTITLEMENT_LABEL)
sat_org_total = count['allocated']
self.assertTrue(count['free'] >= 100)
@@ -148,34 +148,34 @@ class OrgTests(RhnTestCase):
self.org_id, SYSTEM_ENTITLEMENT_LABEL, 100)
self.assertEquals(1, result)
- result = client.org.listSystemEntitlementsForOrg(self.session_key,
+ result = client.org.listSystemEntitlementsForOrg(self.session_key,
self.org_id)
- count = self.__find_count_for_entitlement(result,
+ count = self.__find_count_for_entitlement(result,
SYSTEM_ENTITLEMENT_LABEL)
self.assertEquals(100, count['allocated'])
# Check that the satellite org lost it's entitlements:
- result = client.org.listSystemEntitlementsForOrg(self.session_key,
+ result = client.org.listSystemEntitlementsForOrg(self.session_key,
SATELLITE_ORG_ID)
- count = self.__find_count_for_entitlement(result,
+ count = self.__find_count_for_entitlement(result,
SYSTEM_ENTITLEMENT_LABEL)
self.assertEquals(sat_org_total - 100, count['allocated'])
def test_set_too_many_system_entitlements(self):
- result = client.org.listSystemEntitlementsForOrg(self.session_key,
+ result = client.org.listSystemEntitlementsForOrg(self.session_key,
SATELLITE_ORG_ID)
- count = self.__find_count_for_entitlement(result,
+ count = self.__find_count_for_entitlement(result,
SYSTEM_ENTITLEMENT_LABEL)
sat_org_free = count['free']
# Allocate one too many entitlements:
- result = self.assertRaises(Exception,
+ result = self.assertRaises(Exception,
client.org.setSoftwareEntitlements, self.session_key,
self.org_id, SYSTEM_ENTITLEMENT_LABEL, sat_org_free + 1)
def test_set_system_entitlements_on_default_org(self):
self.assertRaises(Exception, client.org.setSystemEntitlements,
- self.session_key, SATELLITE_ORG_ID, SYSTEM_ENTITLEMENT_LABEL,
+ self.session_key, SATELLITE_ORG_ID, SYSTEM_ENTITLEMENT_LABEL,
100)
diff --git a/java/scripts/api/systemsearchtests.py \
b/java/scripts/api/systemsearchtests.py index 23fa0c1..c9152d6 100755
--- a/java/scripts/api/systemsearchtests.py
+++ b/java/scripts/api/systemsearchtests.py
@@ -14,7 +14,7 @@ class SystemSearchTests(RhnTestCase):
self.assertTrue(s.has_key("name"))
self.assertTrue(s.has_key("ip"))
self.assertTrue(s.has_key("id"))
-
+
def test_searchByIp(self):
systems = client.system.search.ip(self.session_key, SYS_SEARCH_IP)
self.assertTrue(systems != None)
diff --git a/java/scripts/api/systemtests.py b/java/scripts/api/systemtests.py
index c3ecb76..ef9a5de 100644
--- a/java/scripts/api/systemtests.py
+++ b/java/scripts/api/systemtests.py
@@ -16,7 +16,7 @@ class SystemTests(RhnTestCase):
self.assertTrue(len(kernel) > 0)
def test_compare_profiles(self):
- result = client.system.comparePackages(self.session_key,
+ result = client.system.comparePackages(self.session_key,
SERVER_ID, SERVER_ID_2)
for row in result:
self.assertTrue(row.has_key('package_name'))
@@ -40,7 +40,7 @@ class SystemTests(RhnTestCase):
# errata_ids.append(e['id'])
# earliest = datetime.now() + timedelta(3) # 3 days from now
# dt = xmlrpclib.DateTime(earliest.timetuple())
- # client.system.scheduleApplyErrata(self.session_key, SERVER_ID,
+ # client.system.scheduleApplyErrata(self.session_key, SERVER_ID,
# errata_ids, dt)
#def test_apply_errata(self):
# errata = client.system.getRelevantErrata(self.session_key, SERVER_ID)
@@ -78,10 +78,10 @@ class SystemTests(RhnTestCase):
#!/bin/sh
cat /proc/cpuinfo
"""
- earliest = datetime.now() + timedelta(3) # 3 days
+ earliest = datetime.now() + timedelta(3) # 3 days
dt = xmlrpclib.DateTime(earliest.timetuple())
- script_id = client.system.scheduleScriptRun(self.session_key,
+ script_id = client.system.scheduleScriptRun(self.session_key,
SERVER_ID, 'root', 'root', 600, script, dt)
def test_get_script_output(self):
@@ -137,7 +137,7 @@ cat /proc/cpuinfo
def test_sync_to_system(self):
packages_to_sync = [232, 260]
- diff = client.system.comparePackages(self.session_key, SERVER_ID_2,
+ diff = client.system.comparePackages(self.session_key, SERVER_ID_2,
SERVER_ID)
for pnid in packages_to_sync:
found = False
@@ -149,7 +149,7 @@ cat /proc/cpuinfo
earliest = datetime.now() + timedelta(3) # 3 days from now
dt = xmlrpclib.DateTime(earliest.timetuple())
- client.system.scheduleSyncPackagesWithSystem(self.session_key,
+ client.system.scheduleSyncPackagesWithSystem(self.session_key,
SERVER_ID_2, SERVER_ID, packages_to_sync, dt)
def test_get_unscheduled_errata(self):
diff --git a/java/scripts/api/usertests.py b/java/scripts/api/usertests.py
index 5d1c81f..418eb7a 100644
--- a/java/scripts/api/usertests.py
+++ b/java/scripts/api/usertests.py
@@ -11,7 +11,7 @@ class UserTests(RhnTestCase):
def setUp(self):
RhnTestCase.setUp(self)
self.test_user = "TestUser%s" % randint(1, 1000000)
- client.user.create(self.session_key, self.test_user, "testpassword",
+ client.user.create(self.session_key, self.test_user, "testpassword",
"Test", "User", "TestUser@example.com")
self.test_group_names = []
@@ -19,9 +19,9 @@ class UserTests(RhnTestCase):
self.test_group_names.append("Test Group %s" % randint(1, 100000))
self.test_group_names.append("Test Group %s" % randint(1, 100000))
self.test_group_names.append("Test Group %s" % randint(1, 100000))
-
+
for group_name in self.test_group_names:
- group = client.systemgroup.create(self.session_key, group_name,
+ group = client.systemgroup.create(self.session_key, group_name,
"Fake Description")
self.test_group_ids.append(group['id'])
@@ -34,47 +34,47 @@ class UserTests(RhnTestCase):
RhnTestCase.tearDown(self)
def test_add_assigned_system_groups(self):
- groups = client.user.listAssignedSystemGroups(self.session_key,
+ groups = client.user.listAssignedSystemGroups(self.session_key,
self.test_user)
self.assertEquals(0, len(groups))
- ret = client.user.addAssignedSystemGroups(self.session_key,
+ ret = client.user.addAssignedSystemGroups(self.session_key,
self.test_user, self.test_group_ids, False)
self.assertEquals(1, ret)
- groups = client.user.listAssignedSystemGroups(self.session_key,
+ groups = client.user.listAssignedSystemGroups(self.session_key,
self.test_user)
self.assertEquals(len(self.test_group_ids), len(groups))
def test_add_assigned_system_groups_and_set_default(self):
- groups = client.user.listAssignedSystemGroups(self.session_key,
+ groups = client.user.listAssignedSystemGroups(self.session_key,
self.test_user)
self.assertEquals(0, len(groups))
- groups = client.user.listDefaultSystemGroups(self.session_key,
+ groups = client.user.listDefaultSystemGroups(self.session_key,
self.test_user)
self.assertEquals(0, len(groups))
- ret = client.user.addAssignedSystemGroups(self.session_key,
+ ret = client.user.addAssignedSystemGroups(self.session_key,
self.test_user, self.test_group_ids, True)
self.assertEquals(1, ret)
- groups = client.user.listAssignedSystemGroups(self.session_key,
+ groups = client.user.listAssignedSystemGroups(self.session_key,
self.test_user)
self.assertEquals(len(self.test_group_ids), len(groups))
- groups = client.user.listDefaultSystemGroups(self.session_key,
+ groups = client.user.listDefaultSystemGroups(self.session_key,
self.test_user)
self.assertEquals(len(self.test_group_ids), len(groups))
def test_add_assigned_system_group(self):
- groups = client.user.listAssignedSystemGroups(self.session_key,
+ groups = client.user.listAssignedSystemGroups(self.session_key,
self.test_user)
self.assertEquals(0, len(groups))
- ret = client.user.addAssignedSystemGroup(self.session_key,
+ ret = client.user.addAssignedSystemGroup(self.session_key,
self.test_user, self.test_group_ids[0], False)
self.assertEquals(1, ret)
- groups = client.user.listAssignedSystemGroups(self.session_key,
+ groups = client.user.listAssignedSystemGroups(self.session_key,
self.test_user)
self.assertEquals(1, len(groups))
diff --git a/java/scripts/gen-eclipse.py b/java/scripts/gen-eclipse.py
index b84953a..db85a24 100755
--- a/java/scripts/gen-eclipse.py
+++ b/java/scripts/gen-eclipse.py
@@ -8,7 +8,7 @@ base_template="""<?xml version="1.0" encoding="UTF-8"?>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="build/classes"/>
<classpathentry kind="lib" path="code/webapp"/>
-%s
+%s
</classpath>"""
classpath_entry = """ <classpathentry kind="lib" path="%s"/>"""
diff --git a/java/scripts/helpUrlCheck.py b/java/scripts/helpUrlCheck.py
index f878167..da26041 100644
--- a/java/scripts/helpUrlCheck.py
+++ b/java/scripts/helpUrlCheck.py
@@ -59,7 +59,7 @@ if __name__ == "__main__":
for key in brokenUrls.keys():
print " %s" % key
print " Error: %s" % brokenUrls[key]['error']
- print " Files: (note: may include multiple occurrences)"
+ print " Files: (note: may include multiple occurrences)"
filesProcessed = []
for filename in brokenUrls[key]['files']:
if filename not in filesProcessed:
diff --git a/proxy/installer/rhn_proxy_activate.py \
b/proxy/installer/rhn_proxy_activate.py index ca14be2..1712f0a 100644
--- a/proxy/installer/rhn_proxy_activate.py
+++ b/proxy/installer/rhn_proxy_activate.py
@@ -252,7 +252,7 @@ def activateProxy_api_v3_x(options):
def _deactivateProxy_api_v3_x(options):
""" Deactivate this machine as Proxy """
-
+
s = getServer(options, DEFAULT_WEBRPC_HANDLER_v3_x)
systemid = getSystemId()
@@ -333,7 +333,7 @@ def _activateProxy_api_v3_x(options):
return (errorCode, errorString)
def createMonitoringScout(options):
- """ Activate MonitoringScout.
+ """ Activate MonitoringScout.
Just create record on parent.
use activateProxy_api_v3_x method instead.
"""
@@ -369,18 +369,18 @@ def createMonitoringScout(options):
return (errorCode, errorString)
def activateProxy(options):
- """ Activate proxy. Decide how to do it upon apiVersion. Currently we
+ """ Activate proxy. Decide how to do it upon apiVersion. Currently we
support only API v.3.1+. Support for 3.0 and older has been removed.
"""
# errorCode == 0 means activated!
errorCode, errorString = activateProxy_api_v3_x(options)
-
+
if errorCode != 0:
if not errorString:
errorString = ("An unknown error occurred. Consult with your Red Hat \
representative.\n")
sys.stderr.write("\nThere was a problem activating the Spacewalk Proxy \
entitlement:\n%s\n" % errorString) sys.exit(abs(errorCode))
-
+
def listAvailableProxyChannels(options):
""" return list of version available to this system """
@@ -475,7 +475,7 @@ def processCommandline():
# Pad it to be at least 2 components
if len(exploded_version) == 1:
exploded_version.append('0')
-
+
# Make it a string
options.version = '.'.join(exploded_version[:2])
diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py
index d418523..69fe988 100644
--- a/proxy/proxy/apacheHandler.py
+++ b/proxy/proxy/apacheHandler.py
@@ -40,9 +40,9 @@ from proxy.rhnProxyAuth import get_proxy_auth
from spacewalk.common.byterange import parse_byteranges, get_content_range
def getComponentType(req):
- """
+ """
Are we a 'proxy.broker' or a 'proxy.redirect'.
-
+
Checks to see if the last visited Spacewalk Proxy was itself. If so, we
are a 'proxy.redirect'. If not, then we must be a 'proxy.broker'.
"""
@@ -59,7 +59,7 @@ def getComponentType(req):
proxy_server_id = get_proxy_auth().getProxyServerId()
# is it the same box?
try:
- log_debug(4, "last_visited", last_visited, "; proxy server id",
+ log_debug(4, "last_visited", last_visited, "; proxy server id",
proxy_server_id)
# pylint: disable=W0702
except:
@@ -98,15 +98,15 @@ class apacheHandler(rhnApache):
return token
def headerParserHandler(self, req):
- """ Name-munging if request came from anaconda in response to a
- kickstart. """
+ """ Name-munging if request came from anaconda in response to a
+ kickstart. """
ret = rhnApache.headerParserHandler(self, req)
if ret != apache.OK:
return ret
self.input = rpclib.transports.Input(req.headers_in)
- # Before we allow the main handler code to commence, we'll first check
+ # Before we allow the main handler code to commence, we'll first check
# to see if this request came from anaconda in response to a kickstart.
# If so, we'll need to do some special name-munging before we continue.
@@ -115,14 +115,14 @@ class apacheHandler(rhnApache):
def _transformKickstartRequest(self, req):
""" If necessary, this routine will transform a "tinified" anaconda-
- generated kickstart request into a normalized form capable of being
- cached effectively by squid.
-
+ generated kickstart request into a normalized form capable of being
+ cached effectively by squid.
+
This is done by first making a HEAD request
- to the satellite for the purpose of updating the kickstart progress and
- retrieving an MD5 sum for the requested file. We then replace the
+ to the satellite for the purpose of updating the kickstart progress and
+ retrieving an MD5 sum for the requested file. We then replace the
tinyURL part of the URI with the retrieved MD5 sum. This effectively
- removes session-specific information while allowing us to still cache
+ removes session-specific information while allowing us to still cache
based on the uniqueness of the file.
"""
# Kickstart requests only come in the form of a GET, so short-circuit
@@ -130,15 +130,15 @@ class apacheHandler(rhnApache):
if (req.method != "GET"):
return apache.OK
-
+
log_debug(6, "URI", req.uri)
log_debug(6, "COMPONENT", self._component)
- # If we're a broker, we know that this is a kickstart request from
- # anaconda by checking if the URI begins with /ty/*, otherwise just
+ # If we're a broker, we know that this is a kickstart request from
+ # anaconda by checking if the URI begins with /ty/*, otherwise just
# return. If we're an SSL redirect, we check that the URI begins with
# /ty-cksm/*, otherwise return.
-
+
if self._component == COMPONENT_BROKER:
if req.uri.startswith(URI_PREFIX_KS):
log_debug(3, "Found a kickstart URI: %s" % req.uri)
@@ -163,14 +163,14 @@ class apacheHandler(rhnApache):
newURI = self._generateCacheableKickstartURI(req.uri, checksum)
if not newURI:
- # Couldn't create a cacheable URI, log an error and revert to
+ # Couldn't create a cacheable URI, log an error and revert to
# BZ 158236 behavior.
log_error('Could not create cacheable ks URI from "%s"' % req.uri)
return apache.OK
# Now we must embed the old URI into a header in the original request
- # so that the SSL Redirect has it available if the resource has not
+ # so that the SSL Redirect has it available if the resource has not
# been cached yet. We will also embed a header that holds the new URI,
# so that the content handler can use it later.
@@ -183,7 +183,7 @@ class apacheHandler(rhnApache):
@staticmethod
def _transformKsRequestForRedirect(req):
- # If we don't get the actual URI in the headers, we'll decline the
+ # If we don't get the actual URI in the headers, we'll decline the
# request.
if not req.headers_in or not req.headers_in.has_key(HEADER_ACTUAL_URI):
@@ -213,9 +213,9 @@ class apacheHandler(rhnApache):
log_debug(6, "Using scheme: %s" % scheme)
# Initiate a HEAD request to the satellite to retrieve the MD5 sum.
- # Actually, we make the request through our own proxy first, so
- # that we don't accidentally bypass necessary authentication
- # routines. Since it's a HEAD request, the proxy will forward it
+ # Actually, we make the request through our own proxy first, so
+ # that we don't accidentally bypass necessary authentication
+ # routines. Since it's a HEAD request, the proxy will forward it
# directly to the satellite like it would a POST request.
host = "127.0.0.1"
@@ -263,16 +263,16 @@ class apacheHandler(rhnApache):
responseHdrs = response.msg
if not responseHdrs:
- # No headers?! This shouldn't happen at all. But if it does,
+ # No headers?! This shouldn't happen at all. But if it does,
# revert to the old # BZ 158236 behavior.
-
+
log_error("HEAD response - No HTTP headers!")
return (apache.OK, None)
if not responseHdrs.has_key(HEADER_CHECKSUM):
# No checksum was provided. This could happen if a newer
# proxy is talking to an older satellite. To keep things
- # running smoothly, we'll just revert to the BZ 158236
+ # running smoothly, we'll just revert to the BZ 158236
# behavior.
log_debug(1, "HEAD response - No X-RHN-Checksum field provided!")
@@ -287,13 +287,13 @@ class apacheHandler(rhnApache):
"""
This routine computes a new cacheable URI based on the old URI and the
checksum. For example, if the checksum is 1234ABCD and the oldURI was:
-
+
/ty/AljAmCEt/RedHat/base/comps.xml
-
+
Then, the new URI will be:
-
+
/ty-cksm/1234ABCD/RedHat/base/comps.xml
-
+
If for some reason the new URI could not be generated, return None.
"""
@@ -311,7 +311,7 @@ class apacheHandler(rhnApache):
# If the URI didn't have enough parts, return None.
- if numParts <= 2:
+ if numParts <= 2:
newURI = None
return newURI
@@ -464,13 +464,13 @@ class apacheHandler(rhnApache):
compress_response = 0
# This is an xmlrpc Fault, so we have to encode it
needs_xmlrpc_encoding = 1
-
+
output = rpclib.transports.Output()
if not is_fault:
# First, use the same encoding/transfer that the client used
output.set_transport_flags(
- transfer=rpclib.transports.lookupTransfer(self.input.transfer),
+ transfer=rpclib.transports.lookupTransfer(self.input.transfer),
encoding=rpclib.transports.lookupEncoding(self.input.encoding))
if compress_response:
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index c480add..697979b 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -43,7 +43,7 @@ _PROXY_VERSION = '5.5.0' # HISTORY: '0.9.7', '3.2.0', '3.5.0', \
'3.6.0', '4.1.0',
class BrokerHandler(SharedHandler):
- """ Spacewalk Proxy broker specific handler code called by rhnApache.
+ """ Spacewalk Proxy broker specific handler code called by rhnApache.
Workflow is:
Client -> Apache:Broker -> Squid -> Apache:Redirect -> Satellite
@@ -51,7 +51,7 @@ class BrokerHandler(SharedHandler):
Broker handler get request from clients from outside. Some request
(POST and HEAD) bypass cache so, it is passed directly to parent.
For everything else we transform destination to localhost:80 (which
- is handled by Redirect handler) and set proxy as local squid.
+ is handled by Redirect handler) and set proxy as local squid.
This way we got all request cached localy by squid.
"""
@@ -101,10 +101,10 @@ class BrokerHandler(SharedHandler):
self._initConnectionVariables(req)
def _initConnectionVariables(self, req):
- """ set connection variables
+ """ set connection variables
NOTE: self.{caChain,rhnParent,httpProxy*} are initialized
in SharedHandler
-
+
rules:
- GET requests:
. are non-SSLed (potentially SSLed by the redirect)
@@ -183,7 +183,7 @@ class BrokerHandler(SharedHandler):
else:
ip_path += ',' + client_ip
_oto['X-RHN-IP-Path'] = ip_path
-
+
# NOTE: X-RHN-Proxy-Auth described in broker/rhnProxyAuth.py
log_debug(5, 'X-RHN-Proxy-Auth currently set to: %s' % \
repr(_oto['X-RHN-Proxy-Auth']))
@@ -221,7 +221,7 @@ class BrokerHandler(SharedHandler):
% repr(_oto['X-RHN-Proxy-Auth']))
log_debug(3, 'Trying to connect to parent')
-
+
# Loops twice? Here's why:
# o If no errors, the loop is broken and we move on.
# o If an error, either we get a new token and try again,
@@ -302,7 +302,7 @@ class BrokerHandler(SharedHandler):
return (None, None, None, None)
else:
return (args[1], args[2], args[3], args[4:])
-
+
# --- PRIVATE METHODS ---
def __handleAction(self, headers):
@@ -428,7 +428,7 @@ class BrokerHandler(SharedHandler):
def __callLocalRepository(self, channelName, funct, params):
""" Contacts the local repository and retrieves files
-
+
URI looks like:
/$RHN/<channel>/<function>/<params>
"""
diff --git a/proxy/proxy/broker/rhnRepository.py \
b/proxy/proxy/broker/rhnRepository.py index 4d71316..fe345ac 100644
--- a/proxy/proxy/broker/rhnRepository.py
+++ b/proxy/proxy/broker/rhnRepository.py
@@ -82,15 +82,15 @@ class Repository(rhnRepository.Repository):
mapping = cPickle.loads(pickledMapping)
# If the file name has parameters, it's a different kind of package.
- # Determine the architecture requested so we can construct an
+ # Determine the architecture requested so we can construct an
# appropriate filename.
if type(pkgFilename) == types.ListType:
arch = pkgFilename[3]
if isSolarisArch(arch):
pkgFilename = "%s-%s-%s.%s.pkg" % \
- (pkgFilename[0],
- pkgFilename[1],
- pkgFilename[2],
+ (pkgFilename[0],
+ pkgFilename[1],
+ pkgFilename[2],
pkgFilename[3])
if not mapping.has_key(pkgFilename):
@@ -107,7 +107,7 @@ class Repository(rhnRepository.Repository):
def getSourcePackagePath(self, pkgFilename):
""" OVERLOADS getSourcePackagePath in common/rhnRepository.
- snag src.rpm and nosrc.rpm from local repo, after ensuring
+ snag src.rpm and nosrc.rpm from local repo, after ensuring
we are authorized to fetch it.
"""
@@ -284,7 +284,7 @@ def cache(stringObject, directory, filename, version):
while tries > 0:
# Try to create this new file
try:
- fd = os.open(tempfile, os.O_WRONLY | os.O_CREAT | os.O_EXCL,
+ fd = os.open(tempfile, os.O_WRONLY | os.O_CREAT | os.O_EXCL,
0644)
except OSError, e:
if e.errno == 17:
diff --git a/proxy/proxy/redirect/rhnRedirect.py \
b/proxy/proxy/redirect/rhnRedirect.py index 50bafe5..3c97785 100644
--- a/proxy/proxy/redirect/rhnRedirect.py
+++ b/proxy/proxy/redirect/rhnRedirect.py
@@ -34,12 +34,12 @@ from rhn import connections
# Main apache entry point for the proxy.
class RedirectHandler(SharedHandler):
- """ Spacewalk Proxy SSL Redirect specific handler code called by rhnApache.
+ """ Spacewalk Proxy SSL Redirect specific handler code called by rhnApache.
Workflow is:
Client -> Apache:Broker -> Squid -> Apache:Redirect -> Satellite
- Redirect handler get all request for localhost:80 and they come
+ Redirect handler get all request for localhost:80 and they come
from Broker handler through Squid, which hadle caching.
Redirect module transform destination url to parent or http proxy.
Depend on what we have in CFG.
@@ -50,9 +50,9 @@ class RedirectHandler(SharedHandler):
self.componentType = 'proxy.redirect'
self._initConnectionVariables(req)
self.rhnParentXMLRPC = None
-
+
def _initConnectionVariables(self, _req):
- """ set connection variables
+ """ set connection variables
NOTE: self.{caChain,rhnParent,httpProxy*} are initialized
in SharedHandler
"""
@@ -155,7 +155,7 @@ class RedirectHandler(SharedHandler):
if (redirectStatus != apache.HTTP_OK) and (redirectStatus != \
apache.HTTP_PARTIAL_CONTENT):
- # We must have run out of retry attempts. Fail over to Hosted
+ # We must have run out of retry attempts. Fail over to Hosted
# to perform the request.
log_debug(1, "Redirection failed; retries exhausted. " \
@@ -170,33 +170,33 @@ class RedirectHandler(SharedHandler):
return SharedHandler._handleServerResponse(self, status)
def __redirectToNextLocation(self, loopProtection = False):
- """ This function will perform a redirection to the next location, as
- specified in the last response's "Location" header. This function will
- return an actual HTTP response status code. If successful, it will
- return apache.HTTP_OK, not apache.OK. If unsuccessful, this function
- will retry a configurable number of times, as defined in
+ """ This function will perform a redirection to the next location, as
+ specified in the last response's "Location" header. This function will
+ return an actual HTTP response status code. If successful, it will
+ return apache.HTTP_OK, not apache.OK. If unsuccessful, this function
+ will retry a configurable number of times, as defined in
CFG.NETWORK_RETRIES. The following codes define "success".
-
+
HTTP_OK
HTTP_PARTIAL_CONTENT
HTTP_MOVED_TEMPORARILY
HTTP_MOVED_PERMANENTLY
-
+
Upon successful completion of this function, the responseContext
should be populated with the response.
-
+
Arguments:
-
+
loopProtection - If True, this function will insert a special
header into the new request that tells the RHN
server not to issue another redirect to us, in case
that's where we end up being redirected.
-
+
Return:
-
- This function may return any valid HTTP_* response code. See
+
+ This function may return any valid HTTP_* response code. See
__redirectToNextLocationNoRetry for more info.
- """
+ """
retriesLeft = CFG.NETWORK_RETRIES
# We'll now try to redirect to the 3rd party. We will keep
@@ -221,7 +221,7 @@ class RedirectHandler(SharedHandler):
"Code=", \
redirectStatus)
- # Pop the current response context and restore the state to
+ # Pop the current response context and restore the state to
# the last successful response. The acts of remove the current
# context will cause all of its open connections to be closed.
self.responseContext.remove()
@@ -233,23 +233,23 @@ class RedirectHandler(SharedHandler):
return redirectStatus
def __redirectToNextLocationNoRetry(self, loopProtection = False):
- """ This function will perform a redirection to the next location, as
- specified in the last response's "Location" header. This function will
- return an actual HTTP response status code. If successful, it will
- return apache.HTTP_OK, not apache.OK. If unsuccessful, this function
- will simply return; no retries will be performed. The following error
+ """ This function will perform a redirection to the next location, as
+ specified in the last response's "Location" header. This function will
+ return an actual HTTP response status code. If successful, it will
+ return apache.HTTP_OK, not apache.OK. If unsuccessful, this function
+ will simply return; no retries will be performed. The following error
codes can be returned:
-
+
HTTP_OK,HTTP_PARTIAL_CONTENT - Redirect successful.
HTTP_MOVED_TEMPORARILY - Redirect was redirected again by 3rd party.
HTTP_MOVED_PERMANENTLY - Redirect was redirected again by 3rd party.
HTTP_INTERNAL_SERVER_ERROR - Error extracting redirect information
- HTTP_SERVICE_UNAVAILABLE - Could not connect to 3rd party server,
+ HTTP_SERVICE_UNAVAILABLE - Could not connect to 3rd party server,
connection was reset, or a read error
occurred during communication.
HTTP_* - Any other HTTP status code may also be
returned.
-
+
Upon successful completion of this function, a new responseContext
will be created and pushed onto the stack.
"""
@@ -278,7 +278,7 @@ class RedirectHandler(SharedHandler):
redirectLocation = redirectLocation[0]
log_debug(1, " Redirecting to: ", redirectLocation)
- # Tear apart the redirect URL. We need the scheme, the host, the
+ # Tear apart the redirect URL. We need the scheme, the host, the
# port (if not the default), and the URI.
_scheme, host, port, uri = self._parse_url(redirectLocation)
@@ -335,7 +335,7 @@ class RedirectHandler(SharedHandler):
connection.putheader(rhnConstants.HEADER_RHN_REDIRECT, '0')
log_debug(4, " Adding original URL header: ", self.rhnParent)
- connection.putheader(rhnConstants.HEADER_RHN_ORIG_LOC,
+ connection.putheader(rhnConstants.HEADER_RHN_ORIG_LOC,
self.rhnParent)
# Add all the other headers in the original request in case we
@@ -377,7 +377,7 @@ class RedirectHandler(SharedHandler):
self.responseContext.setBodyFd(response)
self.responseContext.setHeaders(response.msg)
- log_debug(4, "Response headers: ",
+ log_debug(4, "Response headers: ",
self.responseContext.getHeaders().items())
log_debug(4, "Got redirect response. Status=", response.status)
@@ -389,10 +389,10 @@ class RedirectHandler(SharedHandler):
""" This routine resends the original request back to the satellite/hosted
system if a redirect to a 3rd party failed. To prevent redirection \
loops
from occurring, an "X-RHN-Redirect: 0" header is passed along with the
- request. This function will return apache.HTTP_OK if everything
+ request. This function will return apache.HTTP_OK if everything
succeeded, otherwise it will return an appropriate HTTP error code.
"""
-
+
# Add a special header which will tell the server not to send us any
# more redirects.
@@ -408,7 +408,7 @@ class RedirectHandler(SharedHandler):
self._connectToParent()
# We'll just call serverCommo once more. The X-RHN-Redirect constant
- # will prevent us from falling into an infinite loop. Only GETs are
+ # will prevent us from falling into an infinite loop. Only GETs are
# redirected, so we can safely pass an empty string in as the request
# body.
diff --git a/proxy/proxy/responseContext.py b/proxy/proxy/responseContext.py
index 7886a42..ddb6cd8 100644
--- a/proxy/proxy/responseContext.py
+++ b/proxy/proxy/responseContext.py
@@ -14,7 +14,7 @@
#
#
# This module provides a response context for use by the proxy broker
-# and redirect components. This context provides a stackable set of
+# and redirect components. This context provides a stackable set of
# response, header, and connection sets which can be used to easily maintain
# the proxy's response state in the event of redirects.
@@ -114,7 +114,7 @@ class ResponseContext:
###############################################################################
# Test Routine
###############################################################################
-
+
if __name__ == "__main__":
respContext = ResponseContext()
print "init | context = " + str(respContext)
diff --git a/proxy/proxy/rhnProxyAuth.py b/proxy/proxy/rhnProxyAuth.py
index 0f0599d..15af87d 100644
--- a/proxy/proxy/rhnProxyAuth.py
+++ b/proxy/proxy/rhnProxyAuth.py
@@ -174,19 +174,19 @@ problems, isn't running, or the token is somehow corrupt.
def login(self):
""" Login and fetch new token (proxy token).
-
+
How it works in a nutshell.
Only the broker component uses this. We perform a xmlrpc request
to rhn_parent. This occurs outside of the http process we are
currently working on. So, we do this all on our own; do all of
our own SSL decisionmaking etc. We use CFG.RHN_PARENT as we always
bypass the SSL redirect.
-
+
DESIGN NOTES: what is the proxy auth token?
-------------------------------------------
An Spacewalk Proxy auth token is a token fetched upon login from
Red Hat Satellite or hosted.
-
+
It has this format:
'S:U:ST:EO:SIG'
Where:
@@ -196,33 +196,33 @@ problems, isn't running, or the token is somehow corrupt.
EO = expiration offset
SIG = signature
H = hostname (important later)
-
+
Within this function within the Spacewalk Proxy Broker we also tag on
the hostname to the end of the token. The token as described above
is enough for authentication purposes, but we need a to identify
the exact hostname (as the Spacewalk Proxy sees it). So now the token
becomes (token:hostname):
'S:U:ST:EO:SIG:H'
-
+
DESIGN NOTES: what is X-RHN-Proxy-Auth?
-------------------------------------------
This is where we use the auth token beyond Spacewalk Proxy login
purposes. This a header used to track request routes through
a hierarchy of RHN Proxies.
-
+
X-RHN-Proxy-Auth is a header that passes proxy authentication
information around in the form of an ordered list of tokens. This
list is used to gain information as to how a client request is
routed throughout an RHN topology.
-
+
Format: 'S1:U1:ST1:EO1:SIG1:H1,S2:U2:ST2:EO2:SIG2:H2,...'
|_________1_________| |_________2_________| |__...
token token
where token is really: token:hostname
-
+
leftmost token was the first token hit by a client request.
rightmost token was the last token hit by a client request.
-
+
"""
# pylint: disable=R0915
@@ -331,9 +331,9 @@ problems, isn't running, or the token is somehow corrupt.
@staticmethod
def __getXmlrpcServer():
""" get an xmlrpc server object
-
+
WARNING: if CFG.USE_SSL is off, we are sending info
- in the clear.
+ in the clear.
"""
log_debug(3)
@@ -400,7 +400,7 @@ class AuthLocalBackend:
def __delitem__(self, key):
rkey = self._compute_key(key)
return rhnCache.delete(rkey)
-
+
def _compute_key(self, key):
return os.path.join(self._cache_prefix, str(key))
diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py
index c2c55ea..adf0efe 100644
--- a/proxy/proxy/rhnShared.py
+++ b/proxy/proxy/rhnShared.py
@@ -137,7 +137,7 @@ class SharedHandler:
else:
log_debug(3, "HTTP proxy info: not using an HTTP proxy")
peer = self.responseContext.getConnection().sock.getpeername()
- log_debug(4, "Other connection info: %s:%s%s" %
+ log_debug(4, "Other connection info: %s:%s%s" %
(peer[0], peer[1], self.uri))
def _create_connection(self):
@@ -183,7 +183,7 @@ class SharedHandler:
def _serverCommo(self):
""" Handler part 2
-
+
Server (or next proxy) communication.
"""
@@ -193,7 +193,7 @@ class SharedHandler:
# handler for this server
# We add path_info to the put (GET, CONNECT, HEAD, PUT, POST) request.
log_debug(2, self.req.method, self.uri)
- self.responseContext.getConnection().putrequest(self.req.method,
+ self.responseContext.getConnection().putrequest(self.req.method,
self.uri)
# Send the headers, the body and expect a response
@@ -266,7 +266,7 @@ class SharedHandler:
continue
ret.append(header[hlen:].strip())
return ret
-
+
def _clientCommo(self, status=apache.OK):
""" Handler part 3
@@ -372,10 +372,10 @@ class SharedHandler:
# At this point everything is sent to the server
# We now wait for the response
try:
- response = http_connection.getresponse()
+ response = http_connection.getresponse()
except TimeoutException:
log_error("Connection timed out")
- return apache.HTTP_GATEWAY_TIME_OUT, None, None
+ return apache.HTTP_GATEWAY_TIME_OUT, None, None
headers = response.msg
status = response.status
# Get the body of the request too - well, just a fd actually
@@ -432,7 +432,7 @@ class SharedHandler:
# Set the field in the response
rhnLib.setHeaderValue(toRequest.headers_out, k, v)
-
+
def _forwardHTTPBody(self, fromResponse, toRequest):
""" This routine will transfer the body of an HTTP response to the output
area of an HTTP request for response to the original requesting client.
diff --git a/rel-eng/bin/sign_unsigned.py b/rel-eng/bin/sign_unsigned.py
index bee7600..06f0f77 100755
--- a/rel-eng/bin/sign_unsigned.py
+++ b/rel-eng/bin/sign_unsigned.py
@@ -51,7 +51,7 @@ class CliTool(AbstractTool):
def __init__(self, opts=None):
AbstractTool.__init__(self)
-
+
# option parser
usage = "%prog [help] <command> [options and arguments] ...]"
self.parser = optparse.OptionParser(usage)
@@ -92,10 +92,10 @@ class CliTool(AbstractTool):
if len(sys.argv) > 1 and not sys.argv[1].startswith('-'):
command = sys.argv[1]
del sys.argv[1]
-
+
# # replace '-' by '_'
# command = command.replace('-', '_')
-
+
# add command-specific options
self.run_options(command, self.parser)
@@ -142,7 +142,7 @@ class CliTool(AbstractTool):
if len(choice) == 0 or choice[0] != 'y':
return False
-
+
return True
@@ -161,7 +161,7 @@ class CliTool(AbstractTool):
prompt = "Enter your password: "
return getpass.getpass(prompt)
-
+
################################################################################
@@ -170,7 +170,7 @@ class CliTool(AbstractTool):
# default action when no (or wrong) command is going to be executed
# override if you need some custom default action handling
# can be used also to handle scripts with no commands
-
+
def parse_default(self):
pass
@@ -216,20 +216,20 @@ class CliTool(AbstractTool):
continue
# mark admin commands with '*'
commands[key[9:]] = '*'
-
+
commandlist = commands.keys()
commandlist.sort()
-
+
for cmd in commandlist:
parser = optparse.OptionParser()
self.run_options(cmd, parser)
-
+
# remove 'help' option
parser.remove_option('-h')
-
+
parser.formatter.indent()
parser.formatter.indent()
-
+
# this ugly command splits the option help and joins it excluding the \
first line (containing 'options:')
result += "\n".join(parser.format_option_help().split('\n')[1:])
@@ -242,7 +242,7 @@ class CliTool(AbstractTool):
################################################################################
# run_* commands
-
+
def run_help(self, command):
help = getattr(self, 'help_%s' % command, None)
if callable(help):
@@ -272,13 +272,13 @@ class CliTool(AbstractTool):
def run_command(self, command=None):
if command == None:
command = self.options.command.replace('-', '_')
-
+
# get command-specific options
# self.run_options(command, self.parser)
# parse arguments for given command
self.run_parse(command)
-
+
# try to run the ADMIN command (method: admincmd_*)
if self.check_admin():
diff --git a/scripts/link-tree.py b/scripts/link-tree.py
index 66b8a21..828fc5c 100755
--- a/scripts/link-tree.py
+++ b/scripts/link-tree.py
@@ -15,17 +15,17 @@ def need_to_backup(src_dir, dest_dir):
src = abspath(join(path, f))
path_suffix = src[len(src_dir) + 1 :]
dest = join(dest_dir, path_suffix)
- if exists(dest) and (not islink(dest) or (islink(dest) and
+ if exists(dest) and (not islink(dest) or (islink(dest) and
src != os.readlink(dest))):
return True
return False
def ignorable(f, ignorables = ["*.*~", "*.swp", "*.pyc", "*.pyo", "*.pyd", \
"Makefile*"]):
- for i in ignorables:
+ for i in ignorables:
if fnmatch.fnmatch(f, i): return True
return False
-
+
def link_tree(src_dir, dest_dir):
src_dir = abspath(src_dir)
dest_dir = abspath(dest_dir)
diff --git a/scripts/ncsu-rhntools/config.py b/scripts/ncsu-rhntools/config.py
index e37d086..1d0269a 100644
--- a/scripts/ncsu-rhntools/config.py
+++ b/scripts/ncsu-rhntools/config.py
@@ -45,12 +45,12 @@ class RHNConfig(Configuration):
def getPassword(self):
return self.get("password")
-
+
class DBConfig(Configuration):
type = "db"
-
+
def getDBType(self):
return self.get("db_type")
diff --git a/scripts/ncsu-rhntools/findpackages.py \
b/scripts/ncsu-rhntools/findpackages.py index f301094..a2a4f9f 100644
--- a/scripts/ncsu-rhntools/findpackages.py
+++ b/scripts/ncsu-rhntools/findpackages.py
@@ -66,16 +66,16 @@ def match(string, unknown, epsilon = 0.0001):
return string == unknown
if isinstance(unknown, IntType) or isinstance(unknown, LongType):
- try:
+ try:
i = int(string)
- except ValueError:
+ except ValueError:
return False
return unknown == i
if isinstance(unknown, FloatType):
- try:
+ try:
f = float(string)
- except ValueError:
+ except ValueError:
return False
return (f - epsilon) <= unknown <= (f + epsilon)
@@ -138,7 +138,7 @@ def bruteForceFind(p):
break
return binpath, srcpath
-
+
print "Error: Could not find packages: %s" % str(p)
return None, None
@@ -155,7 +155,7 @@ def buildTreeUsing(label, rpm, srpm):
if srpm == None:
return
- location = os.path.join(TreeLocation, label, 'SRPMS',
+ location = os.path.join(TreeLocation, label, 'SRPMS',
os.path.basename(srpm))
dir, file = os.path.split(location)
if not os.path.exists(dir):
@@ -175,7 +175,7 @@ def test():
q = {'package_arch_label': 'x86_64', 'package_name': 'sendmail-doc', \
'package_epoch': '100', 'package_version': '8.12.11', 'package_release': '3.3.ncsu', \
'package_id': 8555, 'package_last_modified': '2007-04-04 15:42:15'}
print bruteForceFind(q)
-
+
def main():
rhncfg = config.RHNConfig()
rhn = RHNClient(rhncfg.getURL())
diff --git a/scripts/ncsu-rhntools/groupSummary.py \
b/scripts/ncsu-rhntools/groupSummary.py index f12e3cd..0939176 100644
--- a/scripts/ncsu-rhntools/groupSummary.py
+++ b/scripts/ncsu-rhntools/groupSummary.py
@@ -44,7 +44,7 @@ for system in systems:
c = c + 1
grps = s.system.list_groups(rhn.session, int(system["id"]))
flag = 0
-
+
for grp in grps:
name = grp["system_group_name"]
if int(grp["subscribed"]) > 0:
diff --git a/scripts/ncsu-rhntools/oldSystems.py \
b/scripts/ncsu-rhntools/oldSystems.py index 11a1597..6073daf 100644
--- a/scripts/ncsu-rhntools/oldSystems.py
+++ b/scripts/ncsu-rhntools/oldSystems.py
@@ -31,7 +31,7 @@ from rhnapi import RHNClient
def userconfirm():
"""gets a yes or no from the user, defaults to No"""
- while True:
+ while True:
choice = raw_input('Is this ok [y/N]: ')
choice = choice.lower()
if len(choice) == 0 or choice[0] in ['y', 'n']:
@@ -39,7 +39,7 @@ def userconfirm():
if len(choice) == 0 or choice[0] != 'y':
return False
- else:
+ else:
return True
# end stealage
@@ -54,10 +54,10 @@ def cliOptions():
parser.add_option("-d", "--days", action="store", default0,
type="int", dest="days", help="Your RHN server.")
parser.add_option("--delete", action="store_true", defaultúlse,
- dest="delete",
+ dest="delete",
help="Delete these registrations from RHN.")
parser.add_option("--noconfirm", action="store_true", defaultúlse,
- dest="noconfirm",
+ dest="noconfirm",
help="Don't ask for delete confirmation.")
if len(sys.argv) == 1:
diff --git a/scripts/ncsu-rhntools/rhnapi.py b/scripts/ncsu-rhntools/rhnapi.py
index 4646ab9..f87ad3d 100644
--- a/scripts/ncsu-rhntools/rhnapi.py
+++ b/scripts/ncsu-rhntools/rhnapi.py
@@ -32,7 +32,7 @@ class RHNClient(object):
self.server = xmlrpclib.ServerProxy(self.url)
if user == None or password == None:
user, password = self.auth()
-
+
self.session = self.server.auth.login(user, password, 3600)
@@ -44,4 +44,4 @@ class RHNClient(object):
pw = getpass.getpass("RHN Password: ")
return id, pw
-
+
diff --git a/scripts/ncsu-rhntools/rhnstats/pysqlite.py \
b/scripts/ncsu-rhntools/rhnstats/pysqlite.py index 601972b..07533ed 100644
--- a/scripts/ncsu-rhntools/rhnstats/pysqlite.py
+++ b/scripts/ncsu-rhntools/rhnstats/pysqlite.py
@@ -19,9 +19,9 @@
""" An implementation of currents backend as an sqlite database.
Sqlite is a single file 'embedded' database that supports nearly all
- of the SQL-92 standard. Its a near perfect replacement for the old
+ of the SQL-92 standard. Its a near perfect replacement for the old
shelve implementation.
-
+
"""
import os
@@ -48,12 +48,12 @@ class PySqliteDB(object):
self.initdb()
else:
self.getConnection()
-
+
def __del__(self):
self.disconnect()
-
+
def disconnect(self):
""" Close down the database file. """
if self.cursor:
@@ -62,7 +62,7 @@ class PySqliteDB(object):
if self.conn:
self.conn.close()
self.conn = None
-
+
def initdb(self):
""" Do the steps necessary to create an empty database.
@@ -86,7 +86,7 @@ class PySqliteDB(object):
except Exception, e:
log("Exception raised in sqlite.connect()", MANDATORY)
raise
-
+
return self.conn
@@ -95,6 +95,6 @@ class PySqliteDB(object):
self.cursor = self.conn.cursor()
return self.conn.cursor()
-
+
## END OF LINE ##
diff --git a/scripts/ncsu-rhntools/rhnstats/rhndb.py \
b/scripts/ncsu-rhntools/rhnstats/rhndb.py index e991020..d4d14f2 100644
--- a/scripts/ncsu-rhntools/rhnstats/rhndb.py
+++ b/scripts/ncsu-rhntools/rhnstats/rhndb.py
@@ -17,15 +17,15 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
class RHNStore(object):
-
+
def __init__(self, sdb):
self.sdb = sdb
self.conn = self.sdb.getConnection()
self.c = self.sdb.getCursor()
-
+
def commit(self):
self.conn.commit()
-
+
def addSystem(self, system):
q1 = """select clientid from CLIENTS where rhnsid = %s"""
q2 = """insert into CLIENTS (rhnsid, name, lastcheckin) values
@@ -44,11 +44,11 @@ class RHNStore(object):
self.c.execute(q1, (system["id"],))
return self.c.fetchone()[0]
-
+
def addGroup(self, grp):
q1 = """select groupid from GROUPINFO where rhnsid = %s"""
q2 = """insert into GROUPINFO (rhnsid, name) values (%s, %s)"""
-
+
self.c.execute(q1, (grp["sgid"],))
ret = self.c.fetchone()
@@ -70,7 +70,7 @@ class RHNStore(object):
q2 = """insert into GROUPS (clientid, groupid) values (%s, %s)"""
for id in groupids:
self.c.execute(q2, (clientid, id))
-
+
def markRL(self, clients):
q = ""
for id in clients:
diff --git a/scripts/ncsu-rhntools/rhnstats/rhnstats.py \
b/scripts/ncsu-rhntools/rhnstats/rhnstats.py index 2010741..b0090e5 100644
--- a/scripts/ncsu-rhntools/rhnstats/rhnstats.py
+++ b/scripts/ncsu-rhntools/rhnstats/rhnstats.py
@@ -56,7 +56,7 @@ def parseOpts():
opts, args = opts.parse_args(sys.argv)
return opts
-
+
def main():
opts = parseOpts()
@@ -92,7 +92,7 @@ def populate(db, rhn):
# Sub Channels available for subscription, does not include
# already subscribed sub channels.
- channels = rhn.server.system.list_child_channels(rhn.session,
+ channels = rhn.server.system.list_child_channels(rhn.session,
system["id"])
chanLabels = Set([ i['LABEL'] for i in channels ])
@@ -101,7 +101,7 @@ def populate(db, rhn):
grps = rhn.server.system.list_groups(rhn.session, system["id"])
flag = 0
-
+
for grp in grps:
groupid = db.addGroup(grp)
name = grp["system_group_name"]
@@ -143,7 +143,7 @@ def doCSV(db):
fd.write("\nTotal Licenes,%s" % total)
fd.close()
-
+
def doHTML(db):
file = "rhn.phtml"
templatefile = "template.kid"
@@ -158,7 +158,7 @@ def doHTML(db):
d["rlcount"] = db.getGroupRLCount(group)
p = int(10000 * float(d["count"]) / float(total))
d["percent"] = p / 100.0
-
+
table.append(d)
template = kid.Template(file=templatefile)
@@ -168,7 +168,7 @@ def doHTML(db):
template.date = time.strftime("%A %B %d %H:%M:%S %Z %Y")
template.write(file, fragment=True)
-
+
if __name__ == "__main__":
main()
diff --git a/scripts/ncsu-rhntools/subscribeRHN.py \
b/scripts/ncsu-rhntools/subscribeRHN.py index 54cd4a0..515903c 100644
--- a/scripts/ncsu-rhntools/subscribeRHN.py
+++ b/scripts/ncsu-rhntools/subscribeRHN.py
@@ -24,7 +24,7 @@
# ...ummm... occurance that causes all machines to lose their base
# channel. Getting the base channels back is normally pretty easy
# but at that point all the sub-channel information has been
-# completely lost.
+# completely lost.
import pickle
import xmlrpclib
@@ -84,12 +84,12 @@ for host in hosts:
'realmlinux-as4-amd64']:
chan = c['LABEL']
cid = c['ID']
-
+
if chan == "":
print "Realm Linux channel already set for: %s" % host
continue
-
+
print "Setting sub-channels of %s to %s, %s" % (host, chan, cid)
ret = server.system.setChildChannels(session, sid, [cid])
print "RHN Returned %s" % ret
-
+
diff --git a/scripts/update_symlinks.py b/scripts/update_symlinks.py
index 1db364f..7c0bb03 100755
--- a/scripts/update_symlinks.py
+++ b/scripts/update_symlinks.py
@@ -8,10 +8,10 @@
# 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.
+# in this software or its documentation.
#
#
# Test for blob updates
@@ -19,12 +19,12 @@
# $Id$
"""
-This script is meant to be used by spacewalk users upgrading from 1.0 to 1.1.
-The schema storing the symlinks target path was updated between spacewalk 1.0 to 1.1
+This script is meant to be used by spacewalk users upgrading from 1.0 to 1.1.
+The schema storing the symlinks target path was updated between spacewalk 1.0 to 1.1
from a blob in rhnConfigContent to symlink_target_filename_id in rhnConfigInfo.
This script extracts symlink paths that were previously stored as blobs in \
rhnConfigContent
-and then creates an entry in rhnConfigFileName with that path and sets the
+and then creates an entry in rhnConfigFileName with that path and sets the
rhnConfigInfo.symlink_target_filename_id.
It acquires the database information from rhn.conf
@@ -48,32 +48,32 @@ def setup_db():
db_user = CFG.DB_user
db_password = CFG.DB_PASSWORD
database = CFG.DB_NAME
- rhnSQL.initDB(backendÛ_backend, hostÛ_host, portÛ_port,
+ rhnSQL.initDB(backendÛ_backend, hostÛ_host, portÛ_port,
usernameÛ_user, passwordÛ_password, databaseÚtabase)
def main():
setup_db()
print "================="
print "Updating Symbolic Links"
- q = """select cr.id as rev_id,
+ q = """select cr.id as rev_id,
ccon.id as content_id,
ccon.contents,
cr.CONFIG_INFO_ID as info_id,
cf.id as file_id,
cc.org_id,
wc.name as org_name,
- ci.SELINUX_CTX as selinux,
+ ci.SELINUX_CTX as selinux,
cfn.path as path,
ci.SYMLINK_TARGET_FILENAME_ID as info_target,
nvl( (select path from rhnCOnfigFileName where id = \
ci.SYMLINK_TARGET_FILENAME_ID), 'None') as name_target
- from rhnConfigContent ccon
+ from rhnConfigContent ccon
inner join rhnConfigRevision cr on cr.config_content_id = ccon.id
inner join rhnConfigFile cf on cr.CONFIG_FILE_ID = cf.id
inner join rhnConfigFileName cfn on cfn.id = cf.config_file_name_id
inner join rhnConfigInfo ci on ci.id = cr.CONFIG_INFO_ID
inner join rhnConfigChannel cc on cf.CONFIG_CHANNEL_ID = cc.id
inner join web_customer wc on cc.org_id = wc.id
- where
+ where
cr.CONFIG_FILE_TYPE_ID in (select id from rhnConfigFileType where \
label='symlink')""" h = rhnSQL.prepare(q)
h.execute()
@@ -97,10 +97,10 @@ def main():
symlink_target = rhnSQL.read_lob(row["contents"])))
- update_query = """update rhnConfigRevision set config_info_id + update_query \
= """update rhnConfigRevision set config_info_id lookup_config_info(null, \
null, null, :selinux, lookup_config_filename(:symlink_target)) where id = \
:revision_id"""
- null_symlink_update_query = """update rhnConfigRevision set config_info_id + \
null_symlink_update_query = """update rhnConfigRevision set config_info_id \
lookup_config_info(null, null, null, :selinux, null) where id = :revision_id"""
update_cr = """ update rhnConfigRevision set config_content_id = null where id = \
:revision_id""" @@ -111,7 +111,7 @@ def main():
Update URL: https://<FQDN>/rhn/configuration/file/FileDetails.do?cfid=%(file_id)d&crid=%(revision_id)d
Organization Id : [%(org_id)d]
Organization Name : [%(org_name)s]
- """
+ """
bad_items = list()
for item in contents:
if item['symlink_target'] is None:
@@ -131,10 +131,10 @@ def main():
print "%d rows updated." % len(contents)
print "Update completed"
print "================="
- msg = """
- The following symbolic link paths are either null or not absolute or above 1024 \
characters in length.
- While entries have been added in the DB, the values have to be updated for them \
in the Web UI.
- Please go to the provided url, logging in as a user with config admin/org admin \
role in the specified organization + msg = """
+ The following symbolic link paths are either null or not absolute or above 1024 \
characters in length. + While entries have been added in the DB, the values have \
to be updated for them in the Web UI. + Please go to the provided url, logging in \
as a user with config admin/org admin role in the specified organization and update \
the target path value accordingly. """
diff --git a/search-server/spacewalk-search/scripts/search.py \
b/search-server/spacewalk-search/scripts/search.py index c8d0a04..23910c6 100755
--- a/search-server/spacewalk-search/scripts/search.py
+++ b/search-server/spacewalk-search/scripts/search.py
@@ -10,9 +10,9 @@ search criteria"
parser = OptionParser(usage=usage, descriptionÞsc)
parser.add_option("--sessionid", dest="sessionid", type="int", help="PXT sessionid")
-parser.add_option("--package", action="store_true", dest="package",
+parser.add_option("--package", action="store_true", dest="package",
help="search packages", default=True)
-parser.add_option("--system", action="store_true", dest="system",
+parser.add_option("--system", action="store_true", dest="system",
help="search systems", defaultúlse)
parser.add_option("--indexName", dest="indexName", type="string",
help="lucene index name to search ex: package server hwdevice snapshotTag \
errata")
diff --git a/spacecmd/src/lib/activationkey.py b/spacecmd/src/lib/activationkey.py
index f6024cd..2096b1c 100644
--- a/spacecmd/src/lib/activationkey.py
+++ b/spacecmd/src/lib/activationkey.py
@@ -125,14 +125,14 @@ def complete_activationkey_removegroups(self, text, line, beg, \
end): if len(parts) == 2:
return tab_completer(self.do_activationkey_list('', True), text)
elif len(parts) > 2:
- key_details = self.client.activationkey.getDetails(self.session,
+ key_details = self.client.activationkey.getDetails(self.session,
parts[-1])
groups = []
for group in key_details.get('server_group_ids'):
- details = self.client.systemgroup.getDetails(self.session,
+ details = self.client.systemgroup.getDetails(self.session,
group)
- groups.append(details.get('name'))
+ groups.append(details.get('name'))
return tab_completer(groups, text)
@@ -178,8 +178,8 @@ def do_activationkey_addentitlements(self, args):
key = args.pop(0)
entitlements = args
- self.client.activationkey.addEntitlements(self.session,
- key,
+ self.client.activationkey.addEntitlements(self.session,
+ key,
entitlements)
####################
@@ -211,8 +211,8 @@ def do_activationkey_removeentitlements(self, args):
key = args.pop(0)
entitlements = args
- self.client.activationkey.removeEntitlements(self.session,
- key,
+ self.client.activationkey.removeEntitlements(self.session,
+ key,
entitlements)
####################
@@ -288,8 +288,8 @@ def do_activationkey_removechildchannels(self, args):
key = args.pop(0)
channels = args
- self.client.activationkey.removeChildChannels(self.session,
- key,
+ self.client.activationkey.removeChildChannels(self.session,
+ key,
channels)
####################
@@ -488,9 +488,9 @@ def do_activationkey_addconfigchannels(self, args):
else:
options.top = True
- self.client.activationkey.addConfigChannels(self.session,
- key,
- channels,
+ self.client.activationkey.addConfigChannels(self.session,
+ key,
+ channels,
options.top)
####################
@@ -507,7 +507,7 @@ def complete_activationkey_removeconfigchannels(self, text, line, \
beg, end): return tab_completer(self.do_activationkey_list('', True), text)
elif len(parts) > 2:
key_channels = \
- self.client.activationkey.listConfigChannels(self.session,
+ self.client.activationkey.listConfigChannels(self.session,
parts[1])
config_channels = [c.get('label') for c in key_channels]
@@ -523,8 +523,8 @@ def do_activationkey_removeconfigchannels(self, args):
key = [ args.pop(0) ]
channels = args
- self.client.activationkey.removeConfigChannels(self.session,
- key,
+ self.client.activationkey.removeConfigChannels(self.session,
+ key,
channels)
####################
@@ -534,7 +534,7 @@ def help_activationkey_setconfigchannelorder(self):
'configuration channels'
print 'usage: activationkey_setconfigchannelorder KEY'
-def complete_activationkey_setconfigchannelorder(self, text, line, beg,
+def complete_activationkey_setconfigchannelorder(self, text, line, beg,
end):
return tab_completer(self.do_activationkey_list('', True), text)
@@ -562,8 +562,8 @@ def do_activationkey_setconfigchannelorder(self, args):
for i in range(len(new_channels)):
print '[%i] %s' % (i + 1, new_channels[i])
- self.client.activationkey.setConfigChannels(self.session,
- [key],
+ self.client.activationkey.setConfigChannels(self.session,
+ [key],
new_channels)
####################
@@ -828,7 +828,7 @@ def help_activationkey_enableconfigdeployment(self):
'channel deployment'
print 'usage: activationkey_enableconfigdeployment KEY'
-def complete_activationkey_enableconfigdeployment(self, text, line, beg,
+def complete_activationkey_enableconfigdeployment(self, text, line, beg,
end):
return tab_completer(self.do_activationkey_list('', True), text)
@@ -850,7 +850,7 @@ def help_activationkey_disableconfigdeployment(self):
'channel deployment'
print 'usage: activationkey_disableconfigdeployment KEY'
-def complete_activationkey_disableconfigdeployment(self, text, line, beg,
+def complete_activationkey_disableconfigdeployment(self, text, line, beg,
end):
return tab_completer(self.do_activationkey_list('', True), text)
@@ -890,7 +890,7 @@ def do_activationkey_setbasechannel(self, args):
key = args.pop(0)
channel = args[0]
- current_details = self.client.activationkey.getDetails(self.session,
+ current_details = self.client.activationkey.getDetails(self.session,
key)
details = { 'description' : current_details.get('description'),
@@ -974,7 +974,7 @@ def do_activationkey_setuniversaldefault(self, args):
key = args.pop(0)
- current_details = self.client.activationkey.getDetails(self.session,
+ current_details = self.client.activationkey.getDetails(self.session,
key)
details = { 'description' : current_details.get('description'),
@@ -1026,7 +1026,7 @@ def export_activationkey_getdetails(self, key):
logging.debug("Got config channel label list of %s" % cclist)
details['config_channels'] = cclist
- logging.debug("activationkey.checkConfigDeployment %s" % key)
+ logging.debug("activationkey.checkConfigDeployment %s" % key)
details['config_deploy'] = \
self.client.activationkey.checkConfigDeployment(self.session, key)
@@ -1096,7 +1096,7 @@ def do_activationkey_export(self, args):
if os.path.isfile(filename):
if not self.user_confirm("File %s exists, confirm overwrite file? (y/n)" % \
filename):
- return
+ return
if json_dump_to_file(keydetails_list, filename) != True:
logging.error("Failed to save exported keys to file" % filename)
@@ -1113,7 +1113,7 @@ def do_activationkey_import(self, args):
if len(args) == 0:
logging.error("No filename passed")
- self.help_activationkey_import()
+ self.help_activationkey_import()
return
for filename in args:
diff --git a/spacecmd/src/lib/configchannel.py b/spacecmd/src/lib/configchannel.py
index c85b511..5153d3f 100644
--- a/spacecmd/src/lib/configchannel.py
+++ b/spacecmd/src/lib/configchannel.py
@@ -393,7 +393,7 @@ def configfile_getinfo(self, args, options, file_info=None, \
interactiveúlse): # returns the file_info dict needed to create the file in either
# the configchannel or sytem sandbox/local-override respectively
#
- # file_info is the existing info from lookupFileInfo or None if
+ # file_info is the existing info from lookupFileInfo or None if
# no file for this path exists already
# initialize here instead of multiple times below
@@ -839,7 +839,7 @@ def export_configchannel_getdetails(self, channel):
# need them on import anyway
# We also strip some other fields which are not useful on import
# This is a bit complicated because the createOrUpdateFoo functions
- # take two different struct formats, which are both different to
+ # take two different struct formats, which are both different to
# the format returned by lookupFileInfo, doh!
# We get: We need:
# (file/dir) (symlink)
@@ -1013,7 +1013,7 @@ def import_configchannel_fromdetails(self, ccdetails):
isdir = False
# If binary files (or those containing characters which are
# invalid in XML, e.g the ascii escape character) are
- # exported, on older API versions, you end up with a file
+ # exported, on older API versions, you end up with a file
# with no "contents" key (
# I guess the best thing to do here flag an error and
# import everything else
@@ -1225,25 +1225,25 @@ def do_configchannel_diff(self, args):
return diff( source_data, target_data, source_channel, target_channel )
-####################
-
+####################
+
def help_configchannel_sync(self):
print 'configchannel_sync:'
print 'sync config files between two config channels'
print ''
print 'usage: configchannel_sync SOURCE_CHANNEL TARGET_CHANNEL'
-
+
def complete_configchannel_sync(self, text, line, beg, end):
parts = shlex.split(line)
if line[-1] == ' ': parts.append('')
args = len(parts)
-
+
if args == 2:
return tab_completer(self.do_configchannel_list('', True), text)
if args == 3:
return tab_completer(self.do_configchannel_list('', True), text)
return []
-
+
def do_configchannel_sync(self, args, doreturn = False):
options = []
@@ -1252,10 +1252,10 @@ def do_configchannel_sync(self, args, doreturn = False):
if len(args) != 1 and len(args) != 2:
self.help_configchannel_sync()
return
-
+
source_channel = args[0]
if not self.check_configchannel( source_channel ): return
-
+
target_channel = None
if len(args) == 2:
target_channel = args[1]
@@ -1263,8 +1263,8 @@ def do_configchannel_sync(self, args, doreturn = False):
# can a corresponding channel name be found automatically?
target_channel=self.do_configchannel_getcorresponding( source_channel)
if not self.check_configchannel( target_channel ): return
-
- logging.info( "syncing files from configchannel "+source_channel+" to \
"+target_channel ) +
+ logging.info( "syncing files from configchannel "+source_channel+" to \
"+target_channel )
source_files = set( self.do_configchannel_listfiles( source_channel, doreturn = \
True ) )
target_files = set( self.do_configchannel_listfiles( target_channel, doreturn = \
True ) ) @@ -1288,22 +1288,22 @@ def do_configchannel_sync(self, args, doreturn = \
False): print
if both:
- print "files that are in both channels will be overwritten in the target \
channel" + print "files that are in both channels will be overwritten in the \
target channel" if source_only:
- print "files only in the source channel will be added to the target channel"
+ print "files only in the source channel will be added to the target channel"
if target_only:
print "files only in the target channel will be deleted"
if not (both or source_only or target_only):
logging.info( "nothing to do" )
return
-
+
if not self.user_confirm('perform synchronisation [y/N]:'): return
-
+
source_data_list = self.client.configchannel.lookupFileInfo(\
- self.session, source_channel,
+ self.session, source_channel,
list( both ) + list(source_only) )
-
+
for source_data in source_data_list:
if source_data.get('type') == 'file' or source_data.get('type') == \
'directory':
if source_data.get('contents') and not source_data.get('binary'):
@@ -1323,14 +1323,14 @@ def do_configchannel_sync(self, args, doreturn = False):
}
for k,v in target_data.items():
if not v:
- del target_data[k]
+ del target_data[k]
logging.debug( source_data.get('path') + ": " + str(target_data) )
self.client.configchannel.createOrUpdatePath(self.session,
target_channel,
source_data.get('path'),
source_data.get('type') == \
'directory', target_data)
-
+
elif source_data.get('type') == 'symlink':
target_data = {
'target_path': source_data.get('target_path'),
@@ -1341,14 +1341,14 @@ def do_configchannel_sync(self, args, doreturn = False):
target_channel,
source_data.get('path'),
target_data )
-
+
else:
logging.warning( "unknown file type " + source_data.type )
-
-
+
+
# removing all files from target channel that did not exist on source channel
if target_only:
- #self.do_configchannel_removefiles( target_channel + " " + "/.metainfo" + " \
".join(target_only) ) + #self.do_configchannel_removefiles( target_channel + " \
" + "/.metainfo" + " ".join(target_only) )
self.do_configchannel_removefiles( target_channel + " " + " \
".join(target_only) )
-
+
# vim:ts=4:expandtab:
diff --git a/spacecmd/src/lib/cryptokey.py b/spacecmd/src/lib/cryptokey.py
index 68f22d5..db319ab 100644
--- a/spacecmd/src/lib/cryptokey.py
+++ b/spacecmd/src/lib/cryptokey.py
@@ -45,7 +45,7 @@ def do_cryptokey_create(self, args):
options.description = ''
while options.description == '':
options.description = prompt_user('Description:')
-
+
if self.user_confirm('Read an existing file [y/N]:',
nospacer = True, ignore_yes = True):
options.file = prompt_user('File:')
@@ -90,7 +90,7 @@ def help_cryptokey_delete(self):
def complete_cryptokey_delete(self, text, line, beg, end):
if len(line.split(' ')) <= 2:
- return tab_completer(self.do_cryptokey_list('', True),
+ return tab_completer(self.do_cryptokey_list('', True),
text)
def do_cryptokey_delete(self, args):
diff --git a/spacecmd/src/lib/distribution.py b/spacecmd/src/lib/distribution.py
index 7e1a0ad..be4ab5d 100644
--- a/spacecmd/src/lib/distribution.py
+++ b/spacecmd/src/lib/distribution.py
@@ -71,9 +71,9 @@ def do_distribution_create(self, args, update = False):
install_types = \
self.client.kickstart.tree.listInstallTypes(self.session)
-
+
install_types = [ t.get('label') for t in install_types ]
-
+
options.install_type = ''
while options.install_type == '':
print
@@ -150,7 +150,7 @@ def help_distribution_delete(self):
def complete_distribution_delete(self, text, line, beg, end):
if len(line.split(' ')) <= 2:
- return tab_completer(self.do_distribution_list('', True),
+ return tab_completer(self.do_distribution_list('', True),
text)
def do_distribution_delete(self, args):
@@ -225,7 +225,7 @@ def help_distribution_rename(self):
def complete_distribution_rename(self, text, line, beg, end):
if len(line.split(' ')) <= 2:
- return tab_completer(self.do_distribution_list('', True),
+ return tab_completer(self.do_distribution_list('', True),
text)
def do_distribution_rename(self, args):
@@ -253,7 +253,7 @@ options:
def complete_distribution_update(self, text, line, beg, end):
if len(line.split(' ')) <= 2:
- return tab_completer(self.do_distribution_list('', True),
+ return tab_completer(self.do_distribution_list('', True),
text)
def do_distribution_update(self, args):
diff --git a/spacecmd/src/lib/filepreservation.py \
b/spacecmd/src/lib/filepreservation.py index 1f92a2c..bde6bc9 100644
--- a/spacecmd/src/lib/filepreservation.py
+++ b/spacecmd/src/lib/filepreservation.py
@@ -75,7 +75,7 @@ def do_filepreservation_create(self, args):
print 'File List'
print '---------'
print '\n'.join(sorted(files))
-
+
if not self.user_confirm(): return
self.client.kickstart.filepreservation.create(self.session,
@@ -124,9 +124,9 @@ def do_filepreservation_details(self, args):
name = args[0]
details = \
- self.client.kickstart.filepreservation.getDetails(self.session,
+ self.client.kickstart.filepreservation.getDetails(self.session,
name)
- print '\n'.join(sorted(details.get('file_names')))
+ print '\n'.join(sorted(details.get('file_names')))
# vim:ts=4:expandtab:
diff --git a/spacecmd/src/lib/package.py b/spacecmd/src/lib/package.py
index 830c632..e41608b 100644
--- a/spacecmd/src/lib/package.py
+++ b/spacecmd/src/lib/package.py
@@ -74,7 +74,7 @@ def do_package_details(self, args):
print 'Path: %s' % details.get('path')
print 'Size: %s' % details.get('size')
print 'MD5: %s' % details.get('md5sum')
- print
+ print
print 'Installed Systems: %i' % len(installed_systems)
print
print 'Description'
@@ -166,8 +166,8 @@ def do_package_remove(self, args):
self.client.packages.removePackage(self.session, package_id)
except:
logging.error('Failed to remove package ID %i' % package_id)
-
- # regenerate the package cache after removing these packages
+
+ # regenerate the package cache after removing these packages
self.generate_package_cache(True)
####################
@@ -215,7 +215,7 @@ def do_package_removeorphans(self, args):
logging.error('Failed to remove package ID %i' % package.get('id'))
####################
-
+
def help_package_listinstalledsystems(self):
print 'package_listinstalledsystems: List the systems with a package ' + \
'installed'
@@ -257,7 +257,7 @@ def do_package_listinstalledsystems(self, args):
print '\n'.join(sorted([ s.get('name') for s in systems ]))
####################
-
+
def help_package_listerrata(self):
print 'package_listerrata: List the errata that provide this package'
print 'usage: package_listerrata PACKAGE ...'
diff --git a/spacecmd/src/lib/report.py b/spacecmd/src/lib/report.py
index b0faadc..40b282d 100644
--- a/spacecmd/src/lib/report.py
+++ b/spacecmd/src/lib/report.py
@@ -188,7 +188,7 @@ def do_report_ipaddresses(self, args):
for s in report.keys():
size = len(s)
if size > system_max_size: system_max_size = size
-
+
hostname_max_size = 0
for h in [report[h]['hostname'] for h in report]:
size = len(h)
@@ -204,7 +204,7 @@ def do_report_ipaddresses(self, args):
for system in sorted(report):
print '%s %s %s' % \
- (system.ljust(system_max_size),
+ (system.ljust(system_max_size),
report[system]['hostname'].ljust(hostname_max_size),
report[system]['ip'].ljust(15))
@@ -239,7 +239,7 @@ def do_report_kernels(self, args):
for s in report.keys():
size = len(s)
if size > system_max_size: system_max_size = size
-
+
if len(report):
print '%s Kernel' % ('System'.ljust(system_max_size))
diff --git a/spacecmd/src/lib/schedule.py b/spacecmd/src/lib/schedule.py
index c4fbcc3..3957c94 100644
--- a/spacecmd/src/lib/schedule.py
+++ b/spacecmd/src/lib/schedule.py
@@ -72,7 +72,7 @@ def print_schedule_summary(self, type, args):
if action.get('earliest') < begin_date: continue
if end_date:
- if action.get('earliest') > end_date: continue
+ if action.get('earliest') > end_date: continue
if self.check_api_version('10.11'):
print '%s %s %s %s %s %s' % \
@@ -219,12 +219,12 @@ def do_schedule_details(self, args):
logging.warning('%s is not a valid ID' % str(a))
return
- completed = self.client.schedule.listCompletedSystems(self.session,
+ completed = self.client.schedule.listCompletedSystems(self.session,
action_id)
failed = self.client.schedule.listFailedSystems(self.session, action_id)
- pending = self.client.schedule.listInProgressSystems(self.session,
+ pending = self.client.schedule.listInProgressSystems(self.session,
action_id)
# put all the system arrays together for the summary
@@ -241,11 +241,11 @@ def do_schedule_details(self, args):
action = a
del all_actions
break
-
+
print 'ID: %i' % action.get('id')
print 'Action: %s' % action.get('name')
print 'User: %s' % action.get('scheduler')
- print 'Date: %s' % action.get('earliest')
+ print 'Date: %s' % action.get('earliest')
print
print 'Completed: %s' % str(len(completed)).rjust(3)
print 'Failed: %s' % str(len(failed)).rjust(3)
@@ -352,7 +352,7 @@ def help_schedule_listpending(self):
def do_schedule_listpending(self, args):
return self.print_schedule_summary('pending', args)
-
+
####################
def help_schedule_listcompleted(self):
diff --git a/spacecmd/src/lib/snippet.py b/spacecmd/src/lib/snippet.py
index caeee75..3aec8b9 100644
--- a/spacecmd/src/lib/snippet.py
+++ b/spacecmd/src/lib/snippet.py
@@ -151,7 +151,7 @@ def complete_snippet_update(self, text, line, beg, end):
def do_snippet_update(self, args):
(args, options) = parse_arguments(args)
-
+
if not len(args):
self.help_snippet_update()
return
@@ -169,7 +169,7 @@ def complete_snippet_delete(self, text, line, beg, end):
def do_snippet_delete(self, args):
(args, options) = parse_arguments(args)
-
+
if not len(args):
self.help_snippet_delete()
return
diff --git a/spacecmd/src/lib/softwarechannel.py \
b/spacecmd/src/lib/softwarechannel.py index 93f8867..e4b537d 100644
--- a/spacecmd/src/lib/softwarechannel.py
+++ b/spacecmd/src/lib/softwarechannel.py
@@ -1226,7 +1226,7 @@ def do_softwarechannel_adderrata(self, args):
errata_wanted)
logging.debug("errata = %s" % errata)
if options.skip:
- # We just match the NNNN:MMMM of the XXXX-NNNN:MMMM as the
+ # We just match the NNNN:MMMM of the XXXX-NNNN:MMMM as the
# source errata will be RH[BES]A and the DEST errata will be CLA
dest_errata_suffix = [ x.get('advisory_name').split("-")[1] \
for x in dest_errata]
@@ -1290,7 +1290,7 @@ def do_softwarechannel_adderrata(self, args):
logging.debug('Cloning %s' % erratum)
if self.check_api_version('10.11'):
# This call is poorly documented, but it stops errata.clone
- # pushing EL6 packages into EL5 channels when the errata
+ # pushing EL6 packages into EL5 channels when the errata
# package list contains both versions, ref bz678721
self.client.errata.cloneAsOriginal(self.session, dest_channel,\
[erratum])
diff --git a/spacecmd/src/lib/ssm.py b/spacecmd/src/lib/ssm.py
index b1af91c..60e42ef 100644
--- a/spacecmd/src/lib/ssm.py
+++ b/spacecmd/src/lib/ssm.py
@@ -76,7 +76,7 @@ def do_ssm_add(self, args):
if len(self.ssm):
logging.debug('Systems Selected: %i' % len(self.ssm))
-
+
# save the SSM for use between sessions
save_cache(self.ssm_cache_file, self.ssm)
diff --git a/spacecmd/src/lib/user.py b/spacecmd/src/lib/user.py
index 8764e4a..8a05689 100644
--- a/spacecmd/src/lib/user.py
+++ b/spacecmd/src/lib/user.py
@@ -208,11 +208,11 @@ def help_user_addrole(self):
def complete_user_addrole(self, text, line, beg, end):
parts = line.split(' ')
-
+
if len(parts) == 2:
return tab_completer(self.do_user_list('', True), text)
elif len(parts) == 3:
- return tab_completer(self.do_user_listavailableroles('', True),
+ return tab_completer(self.do_user_listavailableroles('', True),
text)
def do_user_addrole(self, args):
@@ -235,7 +235,7 @@ def help_user_removerole(self):
def complete_user_removerole(self, text, line, beg, end):
parts = line.split(' ')
-
+
if len(parts) == 2:
return tab_completer(self.do_user_list('', True), text)
elif len(parts) == 3:
@@ -290,7 +290,7 @@ def do_user_details(self, args):
logging.warning('%s is not a valid user' % user)
continue
- org_details = self.client.org.getDetails(self.session,
+ org_details = self.client.org.getDetails(self.session,
details.get('org_id'))
organization = org_details.get('name')
@@ -317,7 +317,7 @@ def do_user_details(self, args):
print 'Assigned Groups'
print '---------------'
print '\n'.join(sorted([g.get('name') for g in groups]))
-
+
if len(default_groups):
print
print 'Default Groups'
@@ -333,7 +333,7 @@ def help_user_addgroup(self):
def complete_user_addgroup(self, text, line, beg, end):
parts = shlex.split(line)
if line[-1] == ' ': parts.append('')
-
+
if len(parts) == 2:
return tab_completer(self.do_user_list('', True), text)
elif len(parts) > 2:
@@ -349,9 +349,9 @@ def do_user_addgroup(self, args):
user = args.pop(0)
groups = args
- self.client.user.addAssignedSystemGroups(self.session,
- user,
- groups,
+ self.client.user.addAssignedSystemGroups(self.session,
+ user,
+ groups,
False)
####################
@@ -363,7 +363,7 @@ def help_user_adddefaultgroup(self):
def complete_user_adddefaultgroup(self, text, line, beg, end):
parts = shlex.split(line)
if line[-1] == ' ': parts.append('')
-
+
if len(parts) == 2:
return tab_completer(self.do_user_list('', True), text)
elif len(parts) > 2:
@@ -379,8 +379,8 @@ def do_user_adddefaultgroup(self, args):
user = args.pop(0)
groups = args
- self.client.user.addDefaultSystemGroups(self.session,
- user,
+ self.client.user.addDefaultSystemGroups(self.session,
+ user,
groups)
####################
@@ -392,12 +392,12 @@ def help_user_removegroup(self):
def complete_user_removegroup(self, text, line, beg, end):
parts = shlex.split(line)
if line[-1] == ' ': parts.append('')
-
+
if len(parts) == 2:
return tab_completer(self.do_user_list('', True), text)
elif len(parts) > 2:
# only list the groups currently assigned to this user
- groups = self.client.user.listAssignedSystemGroups(self.session,
+ groups = self.client.user.listAssignedSystemGroups(self.session,
parts[1])
return tab_completer([ g.get('name') for g in groups ], parts[-1])
@@ -411,9 +411,9 @@ def do_user_removegroup(self, args):
user = args.pop(0)
groups = args
- self.client.user.removeAssignedSystemGroups(self.session,
- user,
- groups,
+ self.client.user.removeAssignedSystemGroups(self.session,
+ user,
+ groups,
True)
####################
@@ -426,12 +426,12 @@ def help_user_removedefaultgroup(self):
def complete_user_removedefaultgroup(self, text, line, beg, end):
parts = shlex.split(line)
if line[-1] == ' ': parts.append('')
-
+
if len(parts) == 2:
return tab_completer(self.do_user_list('', True), text)
elif len(parts) > 2:
# only list the groups currently assigned to this user
- groups = self.client.user.listDefaultSystemGroups(self.session,
+ groups = self.client.user.listDefaultSystemGroups(self.session,
parts[1])
return tab_completer([ g.get('name') for g in groups ], parts[-1])
@@ -445,8 +445,8 @@ def do_user_removedefaultgroup(self, args):
user = args.pop(0)
groups = args
- self.client.user.removeDefaultSystemGroups(self.session,
- user,
+ self.client.user.removeDefaultSystemGroups(self.session,
+ user,
groups)
####################
diff --git a/spacecmd/src/lib/utils.py b/spacecmd/src/lib/utils.py
index 8a45f69..7fc85b9 100644
--- a/spacecmd/src/lib/utils.py
+++ b/spacecmd/src/lib/utils.py
@@ -726,7 +726,7 @@ def diff( source_data, target_data, source_channel, \
target_channel ):
def file_needs_b64_enc(self, contents):
- # Used to check if files (config files primarily) need base64 encoding
+ # Used to check if files (config files primarily) need base64 encoding
# in order to work properly via the API
# Files with trailing newlines, which the API strips from files
diff --git a/spacewalk/certs-tools/client_config_update.py \
b/spacewalk/certs-tools/client_config_update.py index eb81984..e9d941c 100755
--- a/spacewalk/certs-tools/client_config_update.py
+++ b/spacewalk/certs-tools/client_config_update.py
@@ -44,13 +44,13 @@ And maps that to the client's configuration files.
To map new settings to a file that uses the format key=value, where
key[comment]=value is a comment line you do this (e.g., mapping
key=value pairs to /etc/sysconfig/rhn/up2date):
-
+
1. edit a file (e.g., 'client-config-overrides.txt'), inputing new key=value \
pairs to replace in config file (e.g., /etc/sysconfig/rhn/up2date).
Specifically:
serverURL=https://test-satellite.example.redhat.com/XMLRPC
noSSLServerURL=http://test-satellite.example.redhat.com/XMLRPC
-
+
2. ./client_config_update.py /etc/sysconfig/rhn/up2date \
client-config-overrides.txt
That's all there is to it.
@@ -109,7 +109,7 @@ def readConfigFile(configFile):
fin = open(configFile, 'rb')
d = {}
-
+
for line in fin.readlines():
kv = _parseConfigLine(line)
if kv:
@@ -191,7 +191,7 @@ examples:
configFilename = os.path.abspath(sys.argv[1])
newMappings = os.path.abspath(sys.argv[2])
-
+
if not os.path.exists(configFilename):
msg = ("ERROR: filename to alter (1st argument), does not exist:\n"
" %s"
diff --git a/spacewalk/certs-tools/rhn_bootstrap.py \
b/spacewalk/certs-tools/rhn_bootstrap.py index 28e1d44..3d98369 100644
--- a/spacewalk/certs-tools/rhn_bootstrap.py
+++ b/spacewalk/certs-tools/rhn_bootstrap.py
@@ -86,7 +86,7 @@ def parseUrl(url):
that normally follows the URL, e.g. /XMLRPC
- if {http[s],file}:// exists, anything between that and the next /
is the URL.
-
+
The behavior of *this* function:
- if no {http[s],file}:// then the string is simply assumed to be a
URL without the {http[s],file}:// attached. The parsed info is
@@ -367,7 +367,7 @@ ERROR: the value of --overrides and --script cannot be the same!
if not options.http_proxy_username:
options.http_proxy_password = ''
-
+
# forcing numeric values
for opt in ['allow_config_actions', 'allow_remote_commands', 'no_ssl',
'no_gpg', 'no_up2date', 'verbose']:
@@ -414,7 +414,7 @@ def copyFiles(options):
elif os.path.isfile(dest):
writeYN = 0
if writeYN:
- copyFile(options.ssl_cert, dest)
+ copyFile(options.ssl_cert, dest)
# corp GPG key
if not options.no_gpg and options.gpg_key:
@@ -427,7 +427,7 @@ def copyFiles(options):
elif os.path.isfile(dest):
writeYN = 0
if writeYN:
- copyFile(options.gpg_key, dest)
+ copyFile(options.gpg_key, dest)
def writeClientConfigOverrides(options):
@@ -460,7 +460,7 @@ def writeClientConfigOverrides(options):
scheme = 'http'
d['serverURL'] = scheme + '://' + options.hostname + '/XMLRPC'
d['noSSLServerURL'] = 'http://' + options.hostname + '/XMLRPC'
-
+
# if proxy, enable it
# if "", disable it
if options.http_proxy:
@@ -575,7 +575,7 @@ def generateBootstrapScript(options):
# concat all those script-bits
newScript = newScript + getConfigFilesSh() + getUp2dateScriptsSh()
-
+
newScript = newScript + getGPGKeyImportSh() + getCorpCACertSh() + \
getRegistrationSh(MY_PRODUCT_NAME)
diff --git a/spacewalk/certs-tools/rhn_bootstrap_strings.py \
b/spacewalk/certs-tools/rhn_bootstrap_strings.py index 7e7c787..3e4423e 100644
--- a/spacewalk/certs-tools/rhn_bootstrap_strings.py
+++ b/spacewalk/certs-tools/rhn_bootstrap_strings.py
@@ -174,7 +174,7 @@ def getHeader(productName, activation_keys, org_gpg_key,
overrides, hostname, orgCACert, isRpmYN,
using_ssl, using_gpg,
allow_config_actions, allow_remote_commands, up2dateYN, pubname):
- #2/14/06 wregglej 181407 If the org_gpg_key option has the path to the file
+ #2/14/06 wregglej 181407 If the org_gpg_key option has the path to the file
#in it, remove it. It will cause the $FETCH to fail.
path_list = os.path.split(org_gpg_key)
if path_list[0] and path_list[0] != '':
diff --git a/spacewalk/certs-tools/rhn_ssl_tool.py \
b/spacewalk/certs-tools/rhn_ssl_tool.py index d0b1030..afe4d48 100755
--- a/spacewalk/certs-tools/rhn_ssl_tool.py
+++ b/spacewalk/certs-tools/rhn_ssl_tool.py
@@ -150,7 +150,7 @@ WARNING: %s
% (s, os.path.basename(unknown), s))
# move legacy server SSL RPMs. But if server_rpm_name is the same name
- # as the target RPM name, then we move the RPMs into the appropriate
+ # as the target RPM name, then we move the RPMs into the appropriate
# machine name directory.
for name in [LEGACY_SERVER_RPM_NAME1, LEGACY_SERVER_RPM_NAME2]:
old_server_rpms = glob.glob(os.path.join(topdir, name+'-*-*.*.rpm'))
@@ -986,7 +986,7 @@ def genServerRpm(d, verbosity=0):
# check for new installed RPM.
# Work out the release number.
hdr = getInstalledHeader(server_rpm_name)
-
+
#find RPMs in the directory as well.
filenames = glob.glob("%s-*.noarch.rpm" % server_rpm)
if filenames:
@@ -1026,7 +1026,7 @@ server with this hostname: %s
if jabberd_user is None:
print ("WARNING: No jabber/jabberd user on system, skipping " +
"jabberd.pem generation.")
-
+
jabberd_cert_string = ""
if jabberd_user is not None:
jabberd_cert_string = \
@@ -1201,7 +1201,7 @@ def main():
10 private CA key generation error
11 public CA certificate generation error
12 public CA certificate RPM build error
-
+
20 private web server key generation error
21 public web server certificate request generation error
22 public web server certificate generation error
diff --git a/spacewalk/certs-tools/sslToolCli.py \
b/spacewalk/certs-tools/sslToolCli.py index 0876fe2..1e85c74 100644
--- a/spacewalk/certs-tools/sslToolCli.py
+++ b/spacewalk/certs-tools/sslToolCli.py
@@ -142,7 +142,7 @@ def _getOptionsTree(defs):
]
# the base options
- _optGenCa = make_option('--gen-ca', action='store_true', help='generate a \
Certificate Authority (CA) key pair and public RPM. Review "--gen-ca --help" for more \
information.') + _optGenCa = make_option('--gen-ca', action='store_true', \
help='generate a Certificate Authority (CA) key pair and public RPM. Review "--gen-ca \
--help" for more information.') _optGenServer = make_option("--gen-server", \
action='store_true', help="""generate the web server's SSL key set, RPM and tar \
archive. Review "--gen-server --help" for more information.""")
@@ -235,7 +235,7 @@ def setIntersection(*sets):
n = len(sets)
if n <= 1:
return unique(sets[0])
-
+
setA = unique(sets[0])
#setB = setIntersection(*sets[1:]) # a python 2.* -ism
setB = apply(setIntersection, sets[1:], {})
diff --git a/spacewalk/certs-tools/sslToolConfig.py \
b/spacewalk/certs-tools/sslToolConfig.py index 87ec350..7f13999 100644
--- a/spacewalk/certs-tools/sslToolConfig.py
+++ b/spacewalk/certs-tools/sslToolConfig.py
@@ -82,7 +82,7 @@ def setOption(options, opt, value):
def getStartDate_aWeekAgo():
- """ for SSL cert/key generation, returns now, minus 1 week
+ """ for SSL cert/key generation, returns now, minus 1 week
just in case weird time zone issues get in the way of a working
cert/key.
@@ -272,7 +272,7 @@ def figureDEFS_distinguishing(options):
#if options:
# print 'XXX options.__dict__.keys()', options.__dict__.keys()
#print 'XXX figureDEFS_distinguishing()'
-
+
## map the config file settings to the DEFS object
conf = {}
caYN = '--gen-ca-cert' in sys.argv or '--gen-ca' in sys.argv
@@ -523,7 +523,7 @@ class ConfigFile:
def parse(self):
""" yank all the pertinent ssl data from a previously
generated openssl.cnf.
-
+
NOTE: we get a limited sampling of info here. We have no concept
of the [ some heading ] divisions in the rhn_openssl.cnf file.
"""
@@ -578,7 +578,7 @@ class ConfigFile:
fo = open(self.filename, 'r')
except:
return
-
+
if newdir is None:
newdir = os.path.dirname(self.filename)
@@ -588,7 +588,7 @@ class ConfigFile:
line = fo.readline()
while line:
- cleanLine = string.strip(line)
+ cleanLine = string.strip(line)
# is this a label?
isLabelYN = 0
diff --git a/spacewalk/certs-tools/sslToolLib.py \
b/spacewalk/certs-tools/sslToolLib.py index a7a4eae..e3e92dd 100644
--- a/spacewalk/certs-tools/sslToolLib.py
+++ b/spacewalk/certs-tools/sslToolLib.py
@@ -124,7 +124,7 @@ def chdir(newdir):
class TempDir:
""" temp directory class with a cleanup destructor and method """
-
+
_shutil = shutil # trying to hang onto shutil during garbage collection
def __init__(self, suffix='-rhn-ssl-tool'):
@@ -148,7 +148,7 @@ class TempDir:
self._shutil.rmtree(self.path)
close = __del__
-
+
#==============================================================================
diff --git a/spacewalk/certs-tools/timeLib.py b/spacewalk/certs-tools/timeLib.py
index 135bf66..3b42656 100644
--- a/spacewalk/certs-tools/timeLib.py
+++ b/spacewalk/certs-tools/timeLib.py
@@ -19,7 +19,7 @@
#
# NOTE: translating seconds to years is an approximation. I.e., xxx secs *
# 365 not really right. Some years do not come out to 365 days.
-#
+#
# $Id$
#
diff --git a/utils/depsolver.py b/utils/depsolver.py
index de0b70c..9798cbf 100644
--- a/utils/depsolver.py
+++ b/utils/depsolver.py
@@ -27,13 +27,13 @@ from yum.packageSack import ListPackageSack
from yum.packages import parsePackages
from yum.repos import RepoStorage
-try:
+try:
from spacewalk.satellite_tools.progress_bar import ProgressBar
except ImportError:
# pylint: disableð401
_LIBPATH = "/usr/share/rhn"
if _LIBPATH not in sys.path:
- sys.path.append(_LIBPATH)
+ sys.path.append(_LIBPATH)
from satellite_tools.progress_bar import ProgressBar
@@ -87,8 +87,8 @@ class DepSolver:
The package name format could be any of the following:
name, name.arch, name-ver-rel.arch, name-ver, name-ver-rel,
epoch:name-ver-rel.arch, name-epoch:ver-rel.arch
- """
-
+ """
+
ematch, match, _unmatch = parsePackages(self._repostore.pkgSack, self.pkgs)
pkgs = []
for po in ematch + match:
@@ -108,8 +108,8 @@ class DepSolver:
"""
solved = []
to_solve = self.pkgs
- all_results = {}
-
+ all_results = {}
+
while to_solve:
log.debug("Solving %s \n\n" % to_solve)
results = self.getDependencylist()
@@ -130,12 +130,12 @@ class DepSolver:
def __locateDeps(self, pkgs):
results = {}
regex_filename_match = re.compile(r'[/*?]|\[[^]]*/[^]]*\]').match
-
+
print("Solving Dependencies (%i): " % len(pkgs))
pb = ProgressBar(prompt='', endTag=' - complete',
finalSize=len(pkgs), finalBarLength@, stream=sys.stdout)
pb.printAll(1)
-
+
for pkg in pkgs:
pb.addTo(1)
pb.printIncrement()
@@ -211,7 +211,7 @@ class DepSolver:
if __name__ == '__main__':
if len(sys.argv) < 3:
print "USAGE: python depsolver.py <repoid> <repodata_path> <pkgname1> \
<pkgname2> ....<pkgnameN>"
- sys.exit(0)
+ sys.exit(0)
arg_repo = {'id' : sys.argv[1],
'relative_path' : sys.argv[2],} #path to where repodata is located
arg_pkgs = sys.argv[3:]
diff --git a/utils/migrateSystemProfile.py b/utils/migrateSystemProfile.py
index aabff4e..4e32c34 100644
--- a/utils/migrateSystemProfile.py
+++ b/utils/migrateSystemProfile.py
@@ -25,15 +25,15 @@ client = None
DEBUG = 0
options_table = [
- Option("-v", "--verbose", action="count",
+ Option("-v", "--verbose", action="count",
help="Increase verbosity"),
- Option("-u", "--username", action="store",
+ Option("-u", "--username", action="store",
help="Satellite/Org Admin username"),
- Option("-p", "--password", action="store",
+ Option("-p", "--password", action="store",
help="Satellite/Org Admin password"),
- Option("--satellite", action="store",
+ Option("--satellite", action="store",
help="Satellite server to run migration"),
- Option("--systemId", action="append",
+ Option("--systemId", action="append",
help="client system to migrate"),
Option("--to-org-id", action="store",
help="Destination Org ID"),
@@ -81,12 +81,12 @@ def main():
to_org_id = options.to_org_id or None
migrate_data = [[options.systemId, to_org_id]]
-
+
username, password = getUsernamePassword(options.username, \
options.password)
-
+
sessionKey = xmlrpc_login(client, username, password)
-
+
if not migrate_data:
sys.stderr.write("Nothing to migrate. Exiting.. \n")
sys.exit(1)
@@ -100,7 +100,7 @@ def main():
migrate_system(sessionKey, int(to_org_id), server_id)
except Exception:
raise
-
+
if DEBUG:
print "Migration Completed successfully"
xmlrpc_logout(client, sessionKey)
@@ -134,7 +134,7 @@ def lookup_server(key, from_org_id):
for row in rows:
print " %s %s " % (row['id'], row['name'])
print "--------------------------------------------"
-
+
return rows
def read_csv_file(csv_file):
[Attachment #3 (text/plain)]
_______________________________________________
spacewalk-commits mailing list
spacewalk-commits@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/spacewalk-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic