[zypp-commit] r9282 - in /trunk/zypper: doc/zypper.8 src/zypper-repos.cc src/zypper.cc

Author: jreidinger Date: Thu Mar 27 16:35:09 2008 New Revision: 9282 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9282&view=rev Log: same default for adding by URL & alias and by repo file. Drop support for no-refresh parameter during addrepo. Modified: trunk/zypper/doc/zypper.8 trunk/zypper/src/zypper-repos.cc trunk/zypper/src/zypper.cc Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=9282&r1=9281&r2=9282&view=diff ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Thu Mar 27 16:35:09 2008 @@ -350,9 +350,6 @@ \fI\-d, \-\-disable\fR Add the repository as disabled. .TP -\fI\-n, \-\-no\-refresh\fR -Add the repository with auto-refresh disabled. -.TP \fI\-c, \-\-check\fR Probe given URI. .TP Modified: trunk/zypper/src/zypper-repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.cc?rev=9282&r1=9281&r2=9282&view=diff ============================================================================== --- trunk/zypper/src/zypper-repos.cc (original) +++ trunk/zypper/src/zypper-repos.cc Thu Mar 27 16:35:09 2008 @@ -1228,7 +1228,7 @@ if ( !indeterminate(enabled) ) repo.setEnabled((enabled == true)); if ( !indeterminate(autorefresh) ) - repo.setAutorefresh((autorefresh == true)); + repo.setAutorefresh((autorefresh == false)); add_repo(zypper, repo); } @@ -1306,7 +1306,7 @@ if ( !indeterminate(enabled) ) repo.setEnabled((enabled == true)); if ( !indeterminate(autorefresh) ) - repo.setAutorefresh((autorefresh == true)); + repo.setAutorefresh((autorefresh == false)); MIL << "enabled: " << repo.enabled() << " autorefresh: " << repo.autorefresh() << endl; add_repo(zypper, repo); Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=9282&r1=9281&r2=9282&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Thu Mar 27 16:35:09 2008 @@ -835,7 +835,6 @@ {"type", required_argument, 0, 't'}, {"disable", no_argument, 0, 'd'}, {"disabled", no_argument, 0, 0}, // backward compatibility - {"no-refresh", no_argument, 0, 'n'}, {"repo", required_argument, 0, 'r'}, {"help", no_argument, 0, 'h'}, {"check", no_argument, 0, 'c'}, @@ -853,7 +852,6 @@ "-r, --repo Read the URL and alias from a file (even remote)\n" "-t, --type <TYPE> Type of repository (%s)\n" "-d, --disable Add the repository as disabled\n" - "-n, --no-refresh Add the repository with auto-refresh disabled\n" "-c, --check Probe URI\n" "-x, --nocheck Don't probe URI, probe later during refresh.\n" )) % "yast2, rpm-md, plaindir"); @@ -1469,19 +1467,16 @@ // indeterminate indicates the user has not specified the values tribool enabled(indeterminate); - tribool refresh(indeterminate); if (copts.count("disable") || copts.count("disabled")) enabled = false; - if (copts.count("no-refresh")) - refresh = false; try { // add repository specified in .repo file if (copts.count("repo")) { - add_repo_from_file(*this,copts["repo"].front(), enabled, refresh); + add_repo_from_file(*this,copts["repo"].front(), enabled); return; } @@ -1498,7 +1493,7 @@ setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); return; case 1: - add_repo_from_file(*this,_arguments[0], enabled, refresh); + add_repo_from_file(*this,_arguments[0], enabled); break; case 2: Url url = make_url (_arguments[0]); @@ -1510,7 +1505,6 @@ // by default, enable the repo and set autorefresh to false if (indeterminate(enabled)) enabled = true; - if (indeterminate(refresh)) refresh = false; if (copts.count("check")) { if (!copts.count("nocheck")) @@ -1528,7 +1522,7 @@ init_target(*this); add_repo_by_url( - *this, url, _arguments[1]/*alias*/, type, enabled, refresh); + *this, url, _arguments[1]/*alias*/, type, enabled); return; } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org