Author: locilka Date: Thu Oct 11 11:52:11 2007 New Revision: 41359 URL: http://svn.opensuse.org/viewcvs/yast?rev=41359&view=rev Log: - Using the new FileUtils::MD5sum function. - Adjusted RPM dependencies. Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/ProductLicense.ycp trunk/packager/yast2-packager.spec.in Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=41359&r1=41358&r2=41359&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Oct 11 11:52:11 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 11 11:51:20 CEST 2007 - locilka@suse.cz + +- Using the new FileUtils::MD5sum function. +- Adjusted RPM dependencies. + +------------------------------------------------------------------- Wed Oct 3 17:42:05 CEST 2007 - locilka@suse.cz - During upgrade, old repositories are removed (they are already Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLicense.ycp?rev=41359&r1=41358&r2=41359&view=diff ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Thu Oct 11 11:52:11 2007 @@ -46,25 +46,12 @@ return nil; } - string ret = ""; - - string cmd = sformat ("md5sum '%1'", String::Quote (filename)); - map cmd_out = (map) SCR::Execute (.target.bash_output, cmd); - - if (cmd_out["exit"]:-1 != 0) { - y2error ("Command >%1< returned %2", cmd, cmd_out); + string filemd5 = FileUtils::MD5sum (filename); + if (filemd5 == nil) { return nil; } - string filemd5 = cmd_out["stdout"]:""; - if (regexpmatch (filemd5, "[^ \t]+[ \t]+.*$")) { - // Format: '19ea7ea41de37314f71c6849ddd259d5 /the/file' - filemd5 = regexpsub (filemd5, "^([^ \t]+)[ \t]+.*$", "\\1"); - } else { - y2warning ("Strange md5out: '%1'", filemd5); - } - - ret = sformat("%1-%2", filemd5, FileUtils::GetSize (filename)); + string ret = sformat("%1-%2", filemd5, FileUtils::GetSize (filename)); y2milestone ("License ident for '%1' is '%2'", filename, ret); Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?rev=41359&r1=41358&r2=41359&view=diff ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Thu Oct 11 11:52:11 2007 @@ -3,7 +3,7 @@ @HEADER@ BuildRequires: gcc-c++ libxcrypt-devel yast2-country yast2-xml docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-devtools yast2-testsuite yast2-slp -BuildRequires: yast2 >= 2.15.38 +BuildRequires: yast2 >= 2.16.2 # Module: OneClickInstallStandard Requires: perl-XML-Bare yast2-perl-bindings @@ -14,8 +14,8 @@ # New function: Pkg::SourceProvideDirectory Requires: yast2-pkg-bindings >= 2.15.38 -# Mode::live_installation -Requires: yast2 >= 2.15.38 +# FileUtils::MD5sum +Requires: yast2 >= 2.16.2 # unzipping license file Requires: unzip -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org