[zypp-commit] r8623 - in /branches/tmp/ma/jump_sat/zypper: doc/zypper.8 src/zypper-repos.cc src/zypper.cc

Author: jkupec Date: Tue Feb 12 12:58:18 2008 New Revision: 8623 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8623&view=rev Log: - ar and mr command options made consistent (bnc #356132, bnc #356135) Modified: branches/tmp/ma/jump_sat/zypper/doc/zypper.8 branches/tmp/ma/jump_sat/zypper/src/zypper-repos.cc branches/tmp/ma/jump_sat/zypper/src/zypper.cc Modified: branches/tmp/ma/jump_sat/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/zypper/doc/zypper.8?rev=8623&r1=8622&r2=8623&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/zypper/doc/zypper.8 (original) +++ branches/tmp/ma/jump_sat/zypper/doc/zypper.8 Tue Feb 12 12:58:18 2008 @@ -331,7 +331,7 @@ \fBrpm-md\fR - repomd, rpmmd, yum, YUM; \fBplaindir\fR - Plaindir. .TP -\fI\-d, \-\-disabled\fR +\fI\-d, \-\-disable\fR Add the repository as disabled. .TP \fI\-n, \-\-no\-refresh\fR @@ -378,10 +378,10 @@ \fI\-d, \-\-disable\fR Disable the repository. .TP -\fI\-a, \-\-enable-autorefresh\fR +\fI\-r, \-\-refresh\fR Enable auto-refresh for the repository. .TP -\fI \-\-disable\-autorefresh\fR +\fI\-n, \-\-no\-refresh\fR Disable auto-refresh for the repository. .TP Modified: branches/tmp/ma/jump_sat/zypper/src/zypper-repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/zypper/src/zypper-repos.cc?rev=8623&r1=8622&r2=8623&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/zypper/src/zypper-repos.cc (original) +++ branches/tmp/ma/jump_sat/zypper/src/zypper-repos.cc Tue Feb 12 12:58:18 2008 @@ -1164,14 +1164,14 @@ // autorefresh tribool autoref = indeterminate; - if (copts.count("enable-autorefresh")) + if (copts.count("refresh")) autoref = true; - if (copts.count("disable-autorefresh")) + if (copts.count("no-refresh")) { if (autoref) { cerr << format(msg_contradition) - % "--enable-autorefresh" % "--disable-autorefresh" << endl; + % "--refresh" % "--no-refresh" << endl; autoref = indeterminate; } Modified: branches/tmp/ma/jump_sat/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/zypper/src/zypper.cc?rev=8623&r1=8622&r2=8623&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/zypper/src/zypper.cc (original) +++ branches/tmp/ma/jump_sat/zypper/src/zypper.cc Tue Feb 12 12:58:18 2008 @@ -780,7 +780,7 @@ { static struct option service_add_options[] = { {"type", required_argument, 0, 't'}, - {"disabled", no_argument, 0, 'd'}, + {"disable", no_argument, 0, 'd'}, {"no-refresh", no_argument, 0, 'n'}, {"repo", required_argument, 0, 'r'}, {"help", no_argument, 0, 'h'}, @@ -796,7 +796,7 @@ " Command options:\n" "-r, --repo Read the URL and alias from a file (even remote)\n" "-t, --type <TYPE> Type of repository (%s)\n" - "-d, --disabled Add the repository as disabled\n" + "-d, --disable Add the repository as disabled\n" "-n, --no-refresh Add the repository with auto-refresh disabled\n" )) % "yast2, rpm-md, plaindir"); break; @@ -865,8 +865,8 @@ {"help", no_argument, 0, 'h'}, {"disable", no_argument, 0, 'd'}, {"enable", no_argument, 0, 'e'}, - {"enable-autorefresh", no_argument, 0, 'a'}, - {"disable-autorefresh", no_argument, 0, 0}, + {"refresh", no_argument, 0, 'r'}, + {"no-refresh", no_argument, 0, 'n'}, {0, 0, 0, 0} }; specific_options = service_modify_options; @@ -878,8 +878,8 @@ " Command options:\n" "-d, --disable Disable the repository (but don't remove it)\n" "-e, --enable Enable a disabled repository\n" - "-a, --enable-autorefresh Enable auto-refresh of the repository\n" - " --disable-autorefresh Disable auto-refresh of the repository\n" + "-a, --refresh Enable auto-refresh of the repository\n" + "-n, --no-refresh Disable auto-refresh of the repository\n" ); break; } @@ -1392,7 +1392,7 @@ tribool enabled(indeterminate); tribool refresh(indeterminate); - if (copts.count("disabled")) + if (copts.count("disable")) enabled = false; if (copts.count("no-refresh")) refresh = false; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org