Hello community, here is the log from the commit of package zypper checked in at Mon Aug 6 18:50:09 CEST 2007. -------- --- zypper/zypper.changes 2007-08-06 16:31:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2007-08-06 18:19:39.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Aug 6 18:17:31 CEST 2007 - jkupec@suse.cz + +- changed zypper source-install to take more arguments at once +- changed the versioned capability to be expected as + NAME[OP<EDITION>] (without spaces) for in/rm commands +- r6498 +- 0.8.9 + +------------------------------------------------------------------- Old: ---- zypper-0.8.8.tar.bz2 New: ---- zypper-0.8.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.oo7623/_old 2007-08-06 18:49:50.000000000 +0200 +++ /var/tmp/diff_new_pack.oo7623/_new 2007-08-06 18:49:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package zypper (Version 0.8.8) +# spec file for package zypper (Version 0.8.9) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,9 +20,9 @@ Autoreqprov: on PreReq: permissions Summary: Command Line Package Management Using Libzypp -Version: 0.8.8 +Version: 0.8.9 Release: 1 -Source: zypper-0.8.8.tar.bz2 +Source: zypper-0.8.9.tar.bz2 Prefix: /usr URL: http://en.opensuse.org/Zypper Provides: y2pmsh @@ -98,6 +98,12 @@ %changelog * Mon Aug 06 2007 - jkupec@suse.cz +- changed zypper source-install to take more arguments at once +- changed the versioned capability to be expected as + NAME[OP<EDITION>] (without spaces) for in/rm commands +- r6498 +- 0.8.9 +* Mon Aug 06 2007 - jkupec@suse.cz - removed provides/obsoletes rug (#294224) - r6491 - 0.8.8 ++++++ zypper-0.8.8.tar.bz2 -> zypper-0.8.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.8/doc/zypper.8 new/zypper-0.8.9/doc/zypper.8 --- old/zypper-0.8.8/doc/zypper.8 2007-08-06 16:31:07.000000000 +0200 +++ new/zypper-0.8.9/doc/zypper.8 2007-08-06 18:19:39.000000000 +0200 @@ -50,8 +50,8 @@ .B install (in) <capability> ... Install resolvables. -Capability is: NAME, or "NAME OP EDITION", where OP is < <= = >= > and -EDITION is VERSION[-RELEASE]. +Capability is: NAME, or "NAME[OP<EDITION>]", where OP is < <= = >= > and +EDITION is VERSION[-RELEASE], for example: zypper-0.8.8-2. Names are not only package names but any symbols provided by packages: /bin/vi, libcurl.so.3, perl(Time::ParseDate). Just remember to quote to protect the @@ -77,10 +77,10 @@ install or remove command. .TP -.B source-install (si) <name> -Install a source package specified by its name. +.B source-install (si) <name> ... +Install source packages specified by their names. -This command will try to find the newest available version of the source package and use rpm -i to install it. +This command will try to find the newest available versions of the source packages and use rpm -i to install them. .TP .B list-updates (lu) [options] diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.8/package/zypper.changes new/zypper-0.8.9/package/zypper.changes --- old/zypper-0.8.8/package/zypper.changes 2007-08-06 16:31:07.000000000 +0200 +++ new/zypper-0.8.9/package/zypper.changes 2007-08-06 18:19:39.000000000 +0200 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Aug 6 18:17:31 CEST 2007 - jkupec@suse.cz + +- changed zypper source-install to take more arguments at once +- changed the versioned capability to be expected as + NAME[OP<EDITION>] (without spaces) for in/rm commands +- r6498 +- 0.8.9 + +------------------------------------------------------------------- Mon Aug 6 16:29:04 CEST 2007 - jkupec@suse.cz - removed provides/obsoletes rug (#294224) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.8/src/zypper.cc new/zypper-0.8.9/src/zypper.cc --- old/zypper-0.8.8/src/zypper.cc 2007-08-06 16:31:07.000000000 +0200 +++ new/zypper-0.8.9/src/zypper.cc 2007-08-06 18:19:39.000000000 +0200 @@ -284,7 +284,7 @@ "install (in) [options] <capability> ...\n" "\n" "Install resolvables with specified capabilities. A capability is" - " NAME[ OP <VERSION>], where OP is one of <, <=, =, >=, >.\n" + " NAME[OP<VERSION>], where OP is one of <, <=, =, >=, >.\n" "\n" " Command options:\n" "-r, --repo <alias> Install resolvables only from repository specified by alias.\n" @@ -313,7 +313,7 @@ "remove (rm) [options] <capability> ...\n" "\n" "Remove resolvables with specified capabilities. A capability is" - " NAME[ OP <VERSION>], where OP is one of <, <=, =, >=, >.\n" + " NAME[OP<VERSION>], where OP is one of <, <=, =, >=, >.\n" "\n" " Command options:\n" "-r, --repo <alias> Operate only with resolvables from repository specified by alias.\n" @@ -329,9 +329,9 @@ }; specific_options = src_install_options; specific_help = _( - "source-install (si) <name>\n" + "source-install (si) <name> ...\n" "\n" - "Install a source package specified by its name.\n" + "Install source packages specified by their names.\n" "\n" "This command has no additional options.\n" ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.8/src/zypper-misc.cc new/zypper-0.8.9/src/zypper-misc.cc --- old/zypper-0.8.8/src/zypper-misc.cc 2007-08-06 16:31:07.000000000 +0200 +++ new/zypper-0.8.9/src/zypper-misc.cc 2007-08-06 18:19:39.000000000 +0200 @@ -136,7 +136,24 @@ Capability safe_parse_cap (const ResObject::Kind &kind, const string & capstr) { Capability cap; try { - cap = CapFactory().parse (kind, capstr); + // expect named caps as NAME[OP<EDITION>] + // transform to NAME[ OP <EDITION>] (add spaces) + string new_capstr = capstr; + cout_vv << "capstr: " << capstr << endl; + int op_pos = capstr.find_first_of("<>="); + if (op_pos != string::npos) + { + new_capstr.insert(op_pos, " "); + cout_vv << "new capstr: " << new_capstr << endl; + op_pos = new_capstr.find_first_not_of("<>=", op_pos + 1); + if (op_pos != string::npos && new_capstr.size() > op_pos) + { + new_capstr.insert(op_pos, " "); + cout_vv << "new capstr: " << new_capstr << endl; + } + } + + cap = CapFactory().parse (kind, new_capstr); } catch (const Exception& e) { ZYPP_CAUGHT(e); @@ -1287,43 +1304,47 @@ * 4. install the source package with ZYpp->installSrcPackage(SrcPackage::constPtr); */ - SrcPackage::Ptr srcpkg; - - gData.repo_resolvables.forEach( - functor::chain( - resfilter::ByName(arguments[0]), - resfilter::ByKind(ResTraits<SrcPackage>::kind)), - FindSrcPackage(srcpkg)); - - if (srcpkg) + int ret = ZYPPER_EXIT_OK; + + for (vector<string>::const_iterator it = arguments.begin(); + it != arguments.end(); ++it) { - cout << format(_("Installing source package %s-%s")) - % srcpkg->name() % srcpkg->edition() << endl; - MIL << "Going to install srcpackage: " << srcpkg << endl; - - try - { - God->installSrcPackage(srcpkg); - - cout << format(_("Source package %s-%s successfully installed.")) - % srcpkg->name() % srcpkg->edition() << endl; + SrcPackage::Ptr srcpkg; - return ZYPPER_EXIT_OK; - } - catch (const Exception & ex) + gData.repo_resolvables.forEach( + functor::chain( + resfilter::ByName(*it), + resfilter::ByKind(ResTraits<SrcPackage>::kind)), + FindSrcPackage(srcpkg)); + + if (srcpkg) { - ZYPP_CAUGHT(ex); - cerr << format(_("Problem installing source package %s-%s:")) + cout << format(_("Installing source package %s-%s")) % srcpkg->name() % srcpkg->edition() << endl; - cerr << ex.asUserString() << endl; - - return ZYPPER_EXIT_ERR_ZYPP; + MIL << "Going to install srcpackage: " << srcpkg << endl; + + try + { + God->installSrcPackage(srcpkg); + + cout << format(_("Source package %s-%s successfully installed.")) + % srcpkg->name() % srcpkg->edition() << endl; + } + catch (const Exception & ex) + { + ZYPP_CAUGHT(ex); + cerr << format(_("Problem installing source package %s-%s:")) + % srcpkg->name() % srcpkg->edition() << endl; + cerr << ex.asUserString() << endl; + + ret = ZYPPER_EXIT_ERR_ZYPP; + } } + else + cerr << format(_("Source package '%s' not found.")) % (*it) << endl; } - else - cerr << format(_("Source package '%s' not found.")) % arguments[0] << endl; - return ZYPPER_EXIT_OK; + return ret; } // Local Variables: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.8/VERSION.cmake new/zypper-0.8.9/VERSION.cmake --- old/zypper-0.8.8/VERSION.cmake 2007-08-06 16:31:07.000000000 +0200 +++ new/zypper-0.8.9/VERSION.cmake 2007-08-06 18:19:39.000000000 +0200 @@ -20,4 +20,4 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "8") -SET(VERSION_PATCH "8") +SET(VERSION_PATCH "9") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org