From df14576b561ff91da0d4ce79bde7a1b54bb155c1 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayonlinux.org>
Date: Sat, 16 May 2009 20:40:34 +0200
Subject: [PATCH] equo: add "equo upgrade" option (alias for equo world)

---
 client/equo.py       | 4 ++--
 client/text_ui.py    | 2 +-
 docs/man/equo.pod    | 2 +-
 docs/man/man1/equo.1 | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/equo.py b/client/equo.py
index f9df5cf81..5ff766105 100644
--- a/client/equo.py
+++ b/client/equo.py
@@ -96,7 +96,7 @@ myopts = [
     None,
     (1,'hop <branch>',1,_('upgrade your distribution to a new release (branch)')),
     None,
-    (1,'world',2,_('update system with the latest available packages')),
+    (1,'world (or upgrade)',1,_('update system with the latest available packages')),
     (2,'--ask',2,_('ask before making any changes')),
     (2,'--fetch',2,_('just download packages')),
     (2,'--pretend',1,_('only show what would be done')),
@@ -509,7 +509,7 @@ def main():
         elif options[0] == "moo":
             do_moo()
 
-        elif options[0] in ("install", "remove", "config", "world",
+        elif options[0] in ("install", "remove", "config", "world", "upgrade",
             "deptest", "unusedpackages", "libtest", "source", "hop"):
 
             import text_ui
diff --git a/client/text_ui.py b/client/text_ui.py
index d023989a6..0e07ae31d 100644
--- a/client/text_ui.py
+++ b/client/text_ui.py
@@ -141,7 +141,7 @@ def package(options):
             print_error(red(" %s." % (_("Nothing to do"),) ))
             rc = 127
 
-    elif (options[0] == "world"):
+    elif (options[0] in ("world","upgrade",)):
         status, rc = worldUpdate(onlyfetch = equoRequestOnlyFetch,
             replay = (equoRequestReplay or equoRequestEmptyDeps),
             resume = equoRequestResume,
diff --git a/docs/man/equo.pod b/docs/man/equo.pod
index 7cd8b91d6..40f3a1da7 100644
--- a/docs/man/equo.pod
+++ b/docs/man/equo.pod
@@ -136,7 +136,7 @@ print description too (w/--quiet)
 
 upgrade your distribution to a new release (branch)
 
-=item B<world>
+=item B<world (or upgrade)>
 
 update system with the latest available packages
 
diff --git a/docs/man/man1/equo.1 b/docs/man/man1/equo.1
index e92f45c45..c5e1cef75 100644
--- a/docs/man/man1/equo.1
+++ b/docs/man/man1/equo.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EQUO 1"
-.TH EQUO 1 "2009-05-15" "perl v5.8.8" "Entropy"
+.TH EQUO 1 "2009-05-16" "perl v5.8.8" "Entropy"
 .SH "NAME"
 \&\fBequo\fR \- Official Sabayon Linux Package Manager Client
 .SH "SYNOPSIS"
@@ -237,8 +237,8 @@ print description too (w/\-\-quiet)
 .IP "\fBhop <branch\fR>" 4
 .IX Item "hop <branch>"
 upgrade your distribution to a new release (branch)
-.IP "\fBworld\fR" 4
-.IX Item "world"
+.IP "\fBworld (or upgrade)\fR" 4
+.IX Item "world (or upgrade)"
 update system with the latest available packages
 .RS 4
 .IP "\fB\-\-ask (\-a)\fR" 4