Author: mvidner Date: Fri Apr 11 10:50:35 2008 New Revision: 46386 URL: http://svn.opensuse.org/viewcvs/yast?rev=46386&view=rev Log: FileChanges::FileChangedFromPackage: fixed to actually consider the file parameter Modified: trunk/yast2/library/system/src/FileChanges.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/system/src/FileChanges.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/src/FileChanges.ycp?rev=46386&r1=46385&r2=46386&view=diff ============================================================================== --- trunk/yast2/library/system/src/FileChanges.ycp (original) +++ trunk/yast2/library/system/src/FileChanges.ycp Fri Apr 11 10:50:35 2008 @@ -79,14 +79,14 @@ * @return boolean true of was changed */ boolean FileChangedFromPackage (string file) { - string cmd = sformat ("/bin/rpm -qf %1", file); + // queryformat: no trailing newline! + string cmd = sformat ("/bin/rpm -qf %1 --qf %%{NAME}-%%{VERSION}-%%{RELEASE}", file); map out = (map)SCR::Execute (.target.bash_output, cmd); string package = out["stdout"]:""; y2milestone ("Package owning %1: %2", file, package); if (package == "") return false; - // FIXME: /bin/xx finds also /usr/bin/xx - cmd = sformat ("rpm -V %1 |grep %2", package, file); + cmd = sformat ("rpm -V %1 |grep ' %2$'", package, file); out = (map)SCR::Execute (.target.bash_output, cmd); string changes = out["stdout"]:""; y2milestone ("File possibly changed: %1", changes); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=46386&r1=46385&r2=46386&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Apr 11 10:50:35 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 11 10:50:20 CEST 2008 - mvidner@suse.cz + +- FileChanges::FileChangedFromPackage: fixed to actually consider the + file parameter + +------------------------------------------------------------------- Thu Apr 10 13:55:25 CEST 2008 - kmachalkova@suse.cz - Hostname.ycp: new functions for retrieving current FQDN, hostname -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org