Merge lp:~brian-murray/apt-clone/string-fixes into lp:apt-clone

Proposed by Brian Murray
Status: Merged
Merged at revision: 99
Proposed branch: lp:~brian-murray/apt-clone/string-fixes
Merge into: lp:apt-clone
Diff against target: 35 lines (+3/-4)
1 file modified
apt-clone (+3/-4)
To merge this branch: bzr merge lp:~brian-murray/apt-clone/string-fixes
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+90556@code.launchpad.net

Description of the change

Just some string fixes I noticed.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'apt-clone'
--- apt-clone 2011-09-19 08:14:34 +0000
+++ apt-clone 2012-01-27 23:51:24 +0000
@@ -36,7 +36,7 @@
36 # clone36 # clone
37 command = subparser.add_parser(37 command = subparser.add_parser(
38 "clone", 38 "clone",
39 help="create a clone-file into <destination>. A alternative source dir can be specified with --source.")39 help="create a clone-file into <destination>. An alternative source dir can be specified with --source.")
40 command.add_argument("--source", default="/",40 command.add_argument("--source", default="/",
41 help="The source dir of the system or chroot, usually '/'") 41 help="The source dir of the system or chroot, usually '/'")
42 command.add_argument("destination")42 command.add_argument("destination")
@@ -50,7 +50,7 @@
50 # restore50 # restore
51 command = subparser.add_parser(51 command = subparser.add_parser(
52 "restore",52 "restore",
53 help="restore a clone file from <source>. A alternative destination can be given with --destination.")53 help="restore a clone file from <source>. An alternative destination can be given with --destination.")
54 command.add_argument("source")54 command.add_argument("source")
55 command.add_argument("--destination", default="/")55 command.add_argument("--destination", default="/")
56 command.add_argument("--simulate", action="store_true", default=False)56 command.add_argument("--simulate", action="store_true", default=False)
@@ -87,7 +87,7 @@
87 print "version mismatch: %s" % ", ".join(clone.version_mismatch)87 print "version mismatch: %s" % ", ".join(clone.version_mismatch)
88 if not args.with_dpkg_repack:88 if not args.with_dpkg_repack:
89 print "\nNote that you can use --with-dpkg-repack to include "\89 print "\nNote that you can use --with-dpkg-repack to include "\
90 "those packges in the clone file."90 "those packages in the clone file."
91 elif args.command == "restore":91 elif args.command == "restore":
92 if args.simulate:92 if args.simulate:
93 miss = clone.simulate_restore_state(args.source)93 miss = clone.simulate_restore_state(args.source)
@@ -115,4 +115,3 @@
115 else:115 else:
116 clone.restore_state(116 clone.restore_state(
117 args.source, args.destination, args.new_distro_codename, protect_installed)117 args.source, args.destination, args.new_distro_codename, protect_installed)
118

Subscribers

People subscribed via source and target branches