From baa707e594b013ec592577fd29f61ef10eb57aa0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 21 Jun 2009 21:45:56 -0500 Subject: fix bug where file file is unlinked when it doesnt exist --- src/fedora-packager-setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/fedora-packager-setup.py') diff --git a/src/fedora-packager-setup.py b/src/fedora-packager-setup.py index d60ac16..6e3e46a 100644 --- a/src/fedora-packager-setup.py +++ b/src/fedora-packager-setup.py @@ -114,7 +114,8 @@ def main(): download_cert('https://admin.fedoraproject.org/accounts/fedora-server-ca.cert', server_ca_cert) if not os.path.islink(upload_ca_cert): print 'Linking: ~/.fedora-server-ca.cert to ~/.fedora-upload-ca.cert' - os.unlink(upload_ca_cert) + if os.path.exists(upload_ca_cert): + os.unlink(upload_ca_cert) os.symlink(server_ca_cert, upload_ca_cert) if not os.path.isdir(os.path.join(user_home, '.koji')): os.mkdir(os.path.join(user_home, '.koji')) -- cgit From 102256826607e43a917c15458955ef2a679778db Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 21 Jun 2009 21:49:31 -0500 Subject: replace existing config file if it exists --- src/fedora-packager-setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/fedora-packager-setup.py') diff --git a/src/fedora-packager-setup.py b/src/fedora-packager-setup.py index 6e3e46a..e015ed3 100644 --- a/src/fedora-packager-setup.py +++ b/src/fedora-packager-setup.py @@ -124,7 +124,10 @@ def main(): if not os.path.isfile(config_file): write_arch_config(arch, config_file) else: - print "koji config for %s exists" % arch + print "koji config for %s exists. Replacing with new file." % arch + os.unlink(config_file) + write_arch_config(arch, config_file) + print 'Setting up Browser Certificates' generate_browser_cert() -- cgit From e46a5a994ca199259f7937691c96531c8b81bc96 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 21 Jun 2009 21:50:23 -0500 Subject: add hppa arch to configs --- src/fedora-packager-setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/fedora-packager-setup.py') diff --git a/src/fedora-packager-setup.py b/src/fedora-packager-setup.py index e015ed3..a74d06b 100644 --- a/src/fedora-packager-setup.py +++ b/src/fedora-packager-setup.py @@ -119,7 +119,7 @@ def main(): os.symlink(server_ca_cert, upload_ca_cert) if not os.path.isdir(os.path.join(user_home, '.koji')): os.mkdir(os.path.join(user_home, '.koji')) - for arch in ['sparc', 'arm', 'alpha', 'ia64', 's390']: + for arch in ['sparc', 'arm', 'alpha', 'ia64', 's390', 'hppa']: config_file = '%s/.koji/%s-config' % (user_home, arch) if not os.path.isfile(config_file): write_arch_config(arch, config_file) -- cgit