[zypp-commit] r9970 - in /trunk/zypper/src: zypper-repos.cc zypper.cc
Author: jkupec
Date: Wed May 7 12:51:02 2008
New Revision: 9970
URL: http://svn.opensuse.org/viewcvs/zypp?rev=9970&view=rev
Log:
- --name added to modifyrepo
- -R is now used for --no-refresh
- -a is now used for --all
- deprecated warning added for --enable-autorefresh and
--disable-autorefresh options
- help text adapted
Modified:
trunk/zypper/src/zypper-repos.cc
trunk/zypper/src/zypper.cc
Modified: trunk/zypper/src/zypper-repos.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.cc?rev=9970&r1=9969&r2=9970&view=diff
==============================================================================
--- trunk/zypper/src/zypper-repos.cc (original)
+++ trunk/zypper/src/zypper-repos.cc Wed May 7 12:51:02 2008
@@ -1652,8 +1652,16 @@
}
}
+ string name;
+ if ((tmp1 = zypper.cOpts().find("name")) != zypper.cOpts().end())
+ {
+ name = *tmp1->second.begin();
+ if (!name.empty())
+ repo.setName(name);
+ }
+
if (chnaged_enabled || changed_autoref || changed_prio
- || changed_keeppackages)
+ || changed_keeppackages || !name.empty())
{
manager.modifyRepository(alias, repo);
@@ -1692,6 +1700,12 @@
zypper.out().info(boost::str(format(
_("Repository '%s' priority has been set to %d.")) % alias % prio));
}
+
+ if (!name.empty())
+ {
+ zypper.out().info(boost::str(format(
+ _("Name of repository '%s' has been set to '%s'.")) % alias % name));
+ }
}
else
{
Modified: trunk/zypper/src/zypper.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=9970&r1=9969&r2=9970&view=diff
==============================================================================
--- trunk/zypper/src/zypper.cc (original)
+++ trunk/zypper/src/zypper.cc Wed May 7 12:51:02 2008
@@ -1065,31 +1065,44 @@
{"disable", no_argument, 0, 'd'},
{"enable", no_argument, 0, 'e'},
{"refresh", no_argument, 0, 'r'},
- {"enable-autorefresh", no_argument, 0, 'a'}, // backward compatibility
- {"no-refresh", no_argument, 0, 'n'},
+ {"enable-autorefresh", no_argument, 0, 0 }, // backward compatibility
+ {"no-refresh", no_argument, 0, 'R'},
{"disable-autorefresh", no_argument, 0, 0 }, // backward compatibility
+ {"name", required_argument, 0, 'n'},
{"priority", required_argument, 0, 'p'},
{"keep-packages", no_argument, 0, 'k'},
- {"no-keep-packages", no_argument, 0, 'K'}, //TODO not documented
- {"all", no_argument, 0, 'A' }, //TODO not documented
- {"local", no_argument, 0, 'l' }, //TODO not documented
- {"remote", no_argument, 0, 't' }, //TODO not documented
- {"medium-type", required_argument, 0, 'm' }, //TODO not documented
+ {"no-keep-packages", no_argument, 0, 'K'},
+ {"all", no_argument, 0, 'a' },
+ {"local", no_argument, 0, 'l' },
+ {"remote", no_argument, 0, 't' },
+ {"medium-type", required_argument, 0, 'm' },
{0, 0, 0, 0}
};
specific_options = service_modify_options;
- _command_help = _(
+ _command_help = str::form(_(
+ // translators: %s is "--all|--remote|--local|--medium-type"
+ // and "--all, --remote, --local, --medium-type"
"modifyrepo (mr) <options>
participants (1)
-
jkupec@svn.opensuse.org