diff --git a/bin/is b/bin/is index 6296cf3a1a3e00576c0ba004ec9c6d047d98b45a..50e6bd06cc62506cf74b5d9c4ef5e8d4067c1ae4 100755 --- a/bin/is +++ b/bin/is @@ -265,7 +265,7 @@ def c_del(parser, args): if repo is None: raise Exception("You cannot delete an image outside a repository") if not args.force: - warn("The following opereation cannot be reversed!") + warn("The following operation cannot be reversed!") out("You will delete %s v%s in repository %s" % (img.name, img.version, repo.config.name)) @@ -470,7 +470,7 @@ p_main.add_argument("-f", "--repo-filter", metavar="REPO,REPO,...", p_main.add_argument("-r", "--repo-path", metavar="PATH", help="define a temporary repository") p_main.add_argument("-C", "--cache", metavar="PATH", - help="path of the repository cache") + help="path of repositories cache") p_main.add_argument("-t", "--timeout", dest="timeout", type=int, default=None, metavar="SECONDS", help="download timeout (default 3)") p_main.add_argument("--no-cache", action="store_true", default=None, @@ -638,7 +638,7 @@ p_list.add_argument("-d", "--date", action="store_true", default=False, p_list.add_argument("-D", "--description", action="store_true", default=False, help="display image description") p_list.add_argument("-j", "--json", action="store_true", default=False, - help="long display") + help="output is formated in json") p_list.add_argument("-l", "--long", action="store_true", default=False, help="long display") p_list.add_argument("-m", "--md5", action="store_true", default=False, diff --git a/installsystems/image.py b/installsystems/image.py index c1a5f2281505d67895d7e3aef961c6d81e76aa04..780e300e9a4d090ee8ce9d746f647dbc4774d592 100644 --- a/installsystems/image.py +++ b/installsystems/image.py @@ -186,14 +186,14 @@ class SourceImage(Image): tarball = Tarball.open(self.image_name, mode="w:gz", dereference=True) except Exception as e: raise Exception("Unable to create tarball %s: %s" % (self.image_name, e)) - # add .description.json + # add description.json arrow("Add description.json") tarball.add_str("description.json", jdescription, tarfile.REGTYPE, 0644) # add changelog if self.changelog is not None: arrow("Add changelog") tarball.add_str("changelog", self.changelog.verbatim, tarfile.REGTYPE, 0644) - # add .format + # add format arrow("Add format") tarball.add_str("format", self.format, tarfile.REGTYPE, 0644) # add parser scripts