Rev 626 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 626 | Rev 707 | ||
|---|---|---|---|
| Line 415... | Line 415... | ||
| 415 | elif line.startswith('## '): |
415 | elif line.startswith('## '): |
| 416 | # Set title of the dialog window |
416 | # Set title of the dialog window |
| 417 | dlg.set_title(line[2:].strip()) |
417 | dlg.set_title(line[2:].strip()) |
| 418 | 418 | ||
| 419 | outf.write('\n') |
419 | outf.write('\n') |
| 420 | outf.write('REVISION=%s\n' % commands.getoutput('svnversion . 2> /dev/null')) |
420 | outf.write('REVISION = %s\n' % commands.getoutput('svnversion . 2> /dev/null')) |
| 421 | outf.write('TIMESTAMP=%s\n' % commands.getoutput('date "+%Y-%m-%d %H:%M:%S"')) |
421 | outf.write('TIMESTAMP = %s\n' % commands.getoutput('date "+%Y-%m-%d %H:%M:%S"')) |
| 422 | outf.close() |
422 | outf.close() |
| 423 | f.close() |
423 | f.close() |
| 424 | return asked_names |
424 | return asked_names |
| 425 | 425 | ||
| 426 | def main(): |
426 | def main(): |
| Line 428... | Line 428... | ||
| 428 | try: |
428 | try: |
| 429 | dlg = Dialog() |
429 | dlg = Dialog() |
| 430 | except NotImplementedError: |
430 | except NotImplementedError: |
| 431 | dlg = NoDialog() |
431 | dlg = NoDialog() |
| 432 | 432 | ||
| 433 | if len(sys.argv) == 2 and sys.argv[1]=='default': |
433 | if len(sys.argv) >= 2 and sys.argv[1]=='default': |
| 434 | defmode = True |
434 | defmode = True |
| 435 | else: |
435 | else: |
| 436 | defmode = False |
436 | defmode = False |
| 437 | 437 | ||
| 438 | # Default run will update the configuration file |
438 | # Default run will update the configuration file |
| 439 | # with newest options |
439 | # with newest options |
| 440 | if os.path.exists(OUTPUT): |
440 | if os.path.exists(OUTPUT): |
| 441 | read_defaults(OUTPUT, defaults) |
441 | read_defaults(OUTPUT, defaults) |
| 442 | 442 | ||
| - | 443 | # Get ARCH from command line if specified |
|
| - | 444 | if len(sys.argv) >= 3: |
|
| - | 445 | defaults['ARCH'] = sys.argv[2] |
|
| - | 446 | ||
| 443 | # Dry run only with defaults |
447 | # Dry run only with defaults |
| 444 | varnames = parse_config(INPUT, TMPOUTPUT, DefaultDialog(dlg), defaults) |
448 | varnames = parse_config(INPUT, TMPOUTPUT, DefaultDialog(dlg), defaults) |
| 445 | # If not in default mode, present selection of all possibilities |
449 | # If not in default mode, present selection of all possibilities |
| 446 | if not defmode: |
450 | if not defmode: |
| 447 | defopt = 0 |
451 | defopt = 0 |