external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add some more error checking to tupkgupdate.

Browse source 
Signed-off-by: Loui Chang <louipc.ist@gmail.com>
This commit is contained in:
Loui Chang 2008-12-10 01:51:50 -05:00
parent a195e38901
commit 5b47a29d2b
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tupkg/update/tupkgupdate
View file

@ -355,7 +355,8 @@ def usage(name):
print " -c, --config Specify a path to the config file." print " -c, --config Specify a path to the config file."
print " -n Don't actually perform any action on the repo." print " -n Don't actually perform any action on the repo."
print " --delete Delete duplicate and temporary pkgs." print " --delete Delete duplicate and temporary pkgs."
print " --paranoid Warn about duplicate pkgs that aren't identical via `cmp`." print " --paranoid Warn of duplicate pkgs that aren't identical."
sys.exit(1)
############################################################ ############################################################
# MAIN # MAIN
@ -369,7 +370,6 @@ try:
['config=', 'delete', 'paranoid']) ['config=', 'delete', 'paranoid'])
except getopt.GetoptError: except getopt.GetoptError:
usage(sys.argv[0]) usage(sys.argv[0])
sys.exit(1)
switches = {} switches = {}
for opt in optlist: for opt in optlist:
@ -378,13 +378,15 @@ for opt in optlist:
# Check for required arguments. # Check for required arguments.
if (len(args) < 3): if (len(args) < 3):
usage(sys.argv[0]) usage(sys.argv[0])
sys.exit(-1)
for opt, value in optlist: for opt, value in optlist:
if opt in ('-c', '--config'): if opt in ('-c', '--config'):
conffile = value conffile = value
try:
repo_dir, pkgbuild_dir, build_dir = args repo_dir, pkgbuild_dir, build_dir = args
except ValueError:
usage(sys.argv[0])
if not os.path.isfile(conffile): if not os.path.isfile(conffile):
print "Error: cannot access config file (%s)" % conffile print "Error: cannot access config file (%s)" % conffile
@ -402,10 +404,15 @@ else:
# Open the database if we need it so we find out now if we can't! # Open the database if we need it so we find out now if we can't!
if config_use_db: if config_use_db:
try:
db = PackageDatabase(config.get('mysql', 'host'), db = PackageDatabase(config.get('mysql', 'host'),
config.get('mysql', 'username'), config.get('mysql', 'username'),
config.get('mysql', 'password'), config.get('mysql', 'password'),
config.get('mysql', 'db')) config.get('mysql', 'db'))
except:
print "Error: Could not connect to the database %s at %s." % (
config.get('mysql', 'db'), config.get('mysql', 'host'))
sys.exit(1)
# Set up the lists and tables # Set up the lists and tables
packages = dict() packages = dict()