On 2010-12-10, at 12:11 PM, <[email protected]> wrote:
> Hi Zhang, > > FEA numbers are required for new packages alone. This update, I believe can > be dealt with a bug number. Why? Features can also be relevant to existing packages!! Anas > > Regards, > Madhu > > -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of ext Zhang Qiang > Sent: Friday, December 10, 2010 8:22 AM > To: [email protected] > Subject: [meego-commits] 10792: Changes to Trunk:Testing/zypper > > Hi, > I have made the following changes to zypper in project Trunk:Testing. Please > review and accept ASAP. > > Thank You, > Zhang Qiang > > [This message was auto-generated] > > --- > > Request #10792: > > submit: devel:packagemanagement/zypper(r32) -> Trunk:Testing/zypper > > > Message: > Add MeeGo-support-search-file.patch to support search files, implemented > Feature 11130. > > State: new 2010-12-09T22:22:08 xiaoqiang > Comment: None > > > > changes files: > -------------- > --- zypper.changes > +++ zypper.changes > @@ -0,0 +1,4 @@ > +* Fri Dec 10 2010 Zhang Qiang <[email protected]> - 1.4.7 > +- Add MeeGo-support-search-file.patch to support search files > + Feature 11130. > + > > new: > ---- > MeeGo-support-search-file.patch > > spec files: > ----------- > --- zypper.spec > +++ zypper.spec > @@ -16,6 +16,7 @@ > Source1: %{name}-rpmlintrc > Source100: zypper.yaml > Patch0: MeeGo-remove-multiversionInstall.patch > +Patch1: MeeGo-support-search-file.patch > Requires: procps > BuildRequires: pkgconfig(libzypp) > BuildRequires: pkgconfig(augeas) > @@ -42,6 +43,8 @@ > > # MeeGo-remove-multiversionInstall.patch > %patch0 -p1 > +# MeeGo-support-search-file.patch > +%patch1 -p1 > # >> setup > # << setup > > > other changes: > -------------- > > ++++++ MeeGo-remove-multiversionInstall.patch > --- MeeGo-remove-multiversionInstall.patch > +++ MeeGo-remove-multiversionInstall.patch > @@ -7,11 +7,11 @@ > > + for_(it, notupdated.begin(), notupdated.end()) > + { > -+ ResPairSet & resolvables = it->second; > -+ for_(resit, resolvables.begin(), resolvables.end()) > ++ > ++ for_(resit, it->second.begin(), it->second.end()) > + { > + if (resit->second->multiversionInstall() == true) > -+ resolvables.erase(resit); > ++ it->second.erase(resit); > + } > + } > + > > ++++++ MeeGo-support-search-file.patch (new) > --- MeeGo-support-search-file.patch > +++ MeeGo-support-search-file.patch > +diff -uNr zypper-1.4.7/src/Zypper.cc zypper-1.4.7.new/src/Zypper.cc > +--- zypper-1.4.7/src/Zypper.cc 2010-07-27 22:47:21.000000000 +0800 > ++++ zypper-1.4.7.new/src/Zypper.cc 2010-12-10 10:32:24.387512125 +0800 > +@@ -1789,6 +1789,7 @@ > + {"match-words", no_argument, 0, 0}, > + {"match-exact", no_argument, 0, 0}, > + {"search-descriptions", no_argument, 0, 'd'}, > ++ {"search-file", no_argument, 0, 'f'}, > + {"case-sensitive", no_argument, 0, 'C'}, > + {"type", required_argument, 0, 't'}, > + {"sort-by-name", no_argument, 0, 0}, > +@@ -1815,6 +1816,7 @@ > + " --match-words Search for a match to whole words only.\n" > + " --match-exact Searches for an exact package name.\n" > + "-d, --search-descriptions Search also in package summaries and > descriptions.\n" > ++ "-f, --search-file Search also in package file list.\n" > + "-C, --case-sensitive Perform case-sensitive search.\n" > + "-i, --installed-only Show only packages that are already > installed.\n" > + "-u, --uninstalled-only Show only packages that are not currently > installed.\n" > +@@ -2384,6 +2386,7 @@ > + {"match-words", no_argument, 0, 0}, > + {"match-exact", no_argument, 0, 0}, > + {"search-descriptions", no_argument, 0, 'd'}, > ++ {"search-file", no_argument, 0, 'f'}, > + {"case-sensitive", no_argument, 0, 'C'}, > + {"sort-by-name", no_argument, 0, 0}, > + {"sort-by-catalog", no_argument, 0, 0}, > +@@ -3645,6 +3648,12 @@ > + query.addAttribute(sat::SolvAttr::summary); > + query.addAttribute(sat::SolvAttr::description); > + } > ++ if (cOpts().count("search-file")) > ++ { > ++ query.addAttribute(sat::SolvAttr::filelist); > ++ query.setFilesMatchFullPath(true); > ++ query.setMatchExact(); > ++ } > + > + init_target(*this); > + > > ++++++ zypper.yaml > --- zypper.yaml > +++ zypper.yaml > @@ -10,6 +10,7 @@ > - "%{name}-rpmlintrc" > Patches: > - MeeGo-remove-multiversionInstall.patch > + - MeeGo-support-search-file.patch > Description: | > Zypper is a command line tool for managing software. It can be used to add > package repositories, search for packages, install, remove, or update > packages, > > _______________________________________________ > MeeGo-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits > _______________________________________________ > MeeGo-packaging mailing list > [email protected] > http://lists.meego.com/listinfo/meego-packaging _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
