Merge branch 'fix-obsolete' of https://github.com/sebix/osc

osc/commandline.py

@@ -2514,12 +2514,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
         Obsolete command to edit metadata. Use 'meta' now.
 
         See the help output of 'meta'.
-
         """
 
-        print('This command is obsolete. Use \'osc meta <metatype> ...\'.', file=sys.stderr)
+        print("This command is obsolete. Use 'osc meta <metatype> ...'.", file=sys.stderr)
-        print('See \'osc help meta\'.', file=sys.stderr)
+        print("See 'osc help meta'.", file=sys.stderr)
-        #self.do_help([None, 'meta'])
         return 2
 
 
@@ -3584,25 +3582,36 @@ Please submit there instead, or use --nodevelproject to force direct submission.
 
     @cmdln.hide(1)
     def do_deletepac(self, subcmd, opts, *args):
-        print("""${cmd_name} is obsolete !
+        """${cmd_name}:
+
+        Obsolete command to delete package. Use 'delete' or 'rdelete' now.
+
+        See the help output of 'delete' and 'rdelete'.
+        """
+
+        print("""Command deletepac is obsolete !
 
                  Please use either
                    osc delete       for checked out packages or projects
                  or
-                   osc rdelete      for server side operations.""")
+                   osc rdelete      for server side operations.""", file=sys.stderr)
 
-        sys.exit(1)
+        return 2
 
     @cmdln.hide(1)
     @cmdln.option('-f', '--force', action='store_true',
                         help='deletes a project and its packages')
     def do_deleteprj(self, subcmd, opts, project):
-        """${cmd_name} is obsolete !
+        """${cmd_name}:
 
-                 Please use
+        Obsolete command to delete project. Use 'rdelete' now.
-                   osc rdelete PROJECT
+
+        See the help output of 'rdelete'.
         """
-        sys.exit(1)
+
+        print("This command is obsolete. Use 'osc rdelete <project>'.", file=sys.stderr)
+        print("See 'osc help rdelete'.", file=sys.stderr)
+        return 2
 
     @cmdln.alias('metafromspec')
     @cmdln.alias('updatepkgmetafromspec')
@@ -4877,8 +4886,17 @@ Please submit there instead, or use --nodevelproject to force direct submission.
 
     @cmdln.hide(1)
     def do_results_meta(self, subcmd, opts, *args):
-        print("Command results_meta is obsolete. Please use: osc results --xml")
+        """${cmd_name}:
-        sys.exit(1)
+
+        Obsolete command to show build results. Use 'results --xml' now.
+
+        See the help output of 'results'.
+        """
+
+        print("This command is obsolete. Use 'osc results --xml'.",
+              file=sys.stderr)
+        print("See 'osc help results'.", file=sys.stderr)
+        return 2
 
     @cmdln.hide(1)
     @cmdln.option('-l', '--last-build', action='store_true',
@@ -4890,10 +4908,17 @@ Please submit there instead, or use --nodevelproject to force direct submission.
     @cmdln.option('', '--xml', action='store_true',
                         help='generate output in XML (former results_meta)')
     def do_rresults(self, subcmd, opts, *args):
-        print("Command rresults is obsolete. Running 'osc results' instead")
+        """${cmd_name}:
-        self.do_results('results', opts, *args)
-        sys.exit(1)
 
+        Obsolete command to show build results. Use 'results' now.
+
+        See the help output of 'results'.
+        """
+
+        print("Command rresults is obsolete. Running 'osc results' instead",
+              file=sys.stderr)
+        print("See 'osc help results'.", file=sys.stderr)
+        return self.do_results('results', opts, *args)
 
     @cmdln.option('-f', '--force', action='store_true', default=False,
                         help="Don't ask and delete files")
@@ -5075,8 +5100,17 @@ Please submit there instead, or use --nodevelproject to force direct submission.
 
     @cmdln.hide(1)
     def do_rprjresults(self, subcmd, opts, *args):
-        print("Command rprjresults is obsolete. Please use 'osc prjresults'")
+        """${cmd_name}:
-        sys.exit(1)
+
+        Obsolete command to show project-wide build results. Use 'prjresults' now.
+
+        See the help output of 'prjresults'.
+        """
+
+        print("Command rprjresults is obsolete. Please use 'osc prjresults'",
+              file=sys.stderr)
+        print("See 'osc help prjresults'.", file=sys.stderr)
+        return 2
 
     @cmdln.alias('bl')
     @cmdln.alias('blt')
@@ -6210,8 +6244,16 @@ Please submit there instead, or use --nodevelproject to force direct submission.
 
     @cmdln.hide(1)
     def do_rlog(self, subcmd, opts, *args):
-        print("Command rlog is obsolete. Please use 'osc log'")
+        """${cmd_name}:
-        sys.exit(1)
+
+        Obsolete command to show commit logs. Use 'log' now.
+
+        See the help output of 'log'.
+        """
+
+        print("This command is obsolete. Use 'osc log'.", file=sys.stderr)
+        print("See 'osc help log'.", file=sys.stderr)
+        return 2
 
 
     @cmdln.option('-r', '--revision', metavar='rev',