1.1 --- a/cronrec.py	Fri Oct 01 23:23:26 2010 +0200
     1.2 +++ b/cronrec.py	Tue Oct 05 14:44:31 2010 +0200
     1.3 @@ -94,19 +94,20 @@
     1.4  	project = None
     1.5  	activity = None
     1.6  	label = args.label.strip()
     1.7 +	log = args.m
     1.8  	if ":" in label:
     1.9  		project, activity = label.split(":")
    1.10  	else:
    1.11  		project = label
    1.12  	time = datetime.now()
    1.13 -	db.resume(db_file(), None, None, time)
    1.14 -	db.end(db_file(), project, activity, time)	
    1.15 +	db.resume(db_file(), db.find_active_task(db_file()), time, log)
    1.16 +	db.end(db_file(), project, activity, time, log)	
    1.17  
    1.18  def pause(args):
    1.19  	db.pause(db_file(), None, None, datetime.now())	 
    1.20  
    1.21  def resume(args):
    1.22 -	db.resume(db_file(), None, None, datetime.now())	
    1.23 +	db.resume(db_file(), None, None, datetime.now(), args.m)	
    1.24  
    1.25  def status(args):
    1.26  	task = db.status(db_file())
    1.27 @@ -131,10 +132,10 @@
    1.28  
    1.29  	sub_end = subs.add_parser("end")
    1.30  	sub_end.add_argument("label", type=str, nargs="?", default="all:all")
    1.31 +	sub_end.add_argument("-m", type=str)
    1.32  	sub_end.set_defaults(func=end)
    1.33  
    1.34  	sub_end = subs.add_parser("pause")
    1.35 -	sub_end.add_argument("-m", type=str)
    1.36  	sub_end.set_defaults(func=pause)
    1.37  
    1.38  	sub_end = subs.add_parser("resume")