← Back to branch summary

~ahasenack/landscape-client/landscape-client-11.02-0ubuntu0.9.10.0

« back to all changes in this revision

Viewing changes to landscape/deployment.py

  • Committer: Bazaar Package Importer
  • Author(s): Free Ekanayaka
  • Date: 2010-02-10 18:49:25 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20100210184925-di1svw11f8d8oexz
Tags: 1.4.4-0ubuntu0.9.10
https://launchpad.net/bugs/519200
https://launchpad.net/bugs/514334
https://launchpad.net/bugs/517175
https://launchpad.net/bugs/509752
https://launchpad.net/bugs/518501
https://launchpad.net/bugs/218388
https://launchpad.net/bugs/517454
https://launchpad.net/bugs/517453
* New upstream release (LP: #519200):
  - Add a message for creating package locks (LP: #514334)
  - Add support for auto-approved change-packages messages (LP: #517175)
  - Add support for installing server-generated debian packages (LP: #509752)
  - Add support for reporting Eucalyptus topology information (LP: #518501)
  - Fix timeout while inserting large free-space message (LP: #218388)
  - Fix wrong log path in motd (LP: #517454)
  - Fix race condition in process excecution (LP: #517453)

Show diffs side-by-side

added added

removed removed

Lines of Context:
landscape/deployment.py
239
239
        parser = OptionParser(version=VERSION)
240
240
        parser.add_option("-c", "--config", metavar="FILE",
241
241
                          help="Use config from this file (any command line "
242
 
                               "options override settings from the file).")
 
242
                               "options override settings from the file) "
 
243
                               "(default: '/etc/landscape/client.conf').")
243
244
        parser.add_option("--bus", default="system",
244
245
                          help="Which DBUS bus to use. One of 'session' "
245
 
                               "or 'system'.")
 
246
                               "or 'system' (default: 'system').")
246
247
        return parser
247
248
 
248
249
    def get_config_filename(self):
296
297
        parser = super(Configuration, self).make_parser()
297
298
        parser.add_option("-d", "--data-path", metavar="PATH",
298
299
                          default="/var/lib/landscape/client/",
299
 
                          help="The directory to store data files in.")
 
300
                          help="The directory to store data files in "
 
301
                               "(default: '/var/lib/landscape/client/').")
300
302
        parser.add_option("-q", "--quiet", default=False, action="store_true",
301
303
                          help="Do not log to the standard output.")
302
304
        parser.add_option("-l", "--log-dir", metavar="FILE",
303
 
                          help="The directory to write log files to.",
 
305
                          help="The directory to write log files to "
 
306
                               "(default: '/var/log/landscape').",
304
307
                          default="/var/log/landscape")
305
308
        parser.add_option("--log-level", default="info",
306
309
                          help="One of debug, info, warning, error or "
307
310
                               "critical.")
308
311
        parser.add_option("--ignore-sigint", action="store_true", default=False,
309
 
                          help="Ignore interrupt signals. ")
 
312
                          help="Ignore interrupt signals.")
310
313
        parser.add_option("--ignore-sigusr1", action="store_true", default=False,
311
 
                          help="Ignore SIGUSR1 signal to rotate logs. ")
 
314
                          help="Ignore SIGUSR1 signal to rotate logs.")
312
315
 
313
316
        return parser
314
317