[yast-commit] [ci_new_pac] JFYI yast2 -> sle12
Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2 -> sle12 ## BNC# 873923 : "Really move PATTERNS from content to control file" (ASSIGNED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2/yast2.changes 2014-04-17 14:15:14.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2/yast2.changes 2014-04-22 11:29:57.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Apr 22 11:03:21 CEST 2014 - locilka@suse.com + +- Removed Product.patterns (replaced by Packages.default_patterns) + (bnc#873923) +- 3.1.52 + +------------------------------------------------------------------- +Thu Apr 17 15:08:41 UTC 2014 - mvidner@suse.com + +- rewrote URLRecode.pm to URLRecode.rb so that 'yast2 repositories' + can run without Perl bindings +- 3.1.51 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2 - at least 73 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2 (Old) and /mounts/work_src_done/SLE12/yast2 (BS:build ID:36607 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-3.1.50.tar.bz2 New: ---- yast2-3.1.52.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.rQ466Y/_old 2014-04-22 12:34:17.000000000 +0200 +++ /var/tmp/diff_new_pack.rQ466Y/_new 2014-04-22 12:34:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.50 +Version: 3.1.52 Release: 0 URL: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.50.tar.bz2 -> yast2-3.1.52.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.50/library/packages/src/modules/Product.rb new/yast2-3.1.52/library/packages/src/modules/Product.rb --- old/yast2-3.1.50/library/packages/src/modules/Product.rb 2014-04-17 11:18:29.000000000 +0200 +++ new/yast2-3.1.52/library/packages/src/modules/Product.rb 2014-04-22 11:20:27.000000000 +0200 @@ -78,9 +78,6 @@ # list of flags from content file @flags = [] - # list of patterns from content file - @patterns = [] - # Short label for bootloader entry @shortlabel = "" Product() @@ -223,20 +220,6 @@ @shortlabel = SCR.Read(path(".content.SHORTLABEL")) @flags = (SCR.Read(path(".content.FLAGS")) || "").split - @patterns = (SCR.Read(path(".content.PATTERNS")) || "").split - - # bugzilla #252122, since openSUSE 10.3 - # deprecated: - # content.PATTERNS: abc cba bac - # should re replaced with (and/or) - # content.REQUIRES: pattern:abc pattern:cba pattern:bac - # content.RECOMMENDS: pattern:abc pattern:cba pattern:bac - if @patterns != [] - Builtins.y2warning( - "Product content file contains deprecated PATTERNS tag, use REQUIRES and/or RECOMMENDS instead" - ) - Builtins.y2milestone("PATTERNS: %1", @patterns) - end end def read_os_release_file @@ -264,7 +247,6 @@ publish :variable => :product_of_relnotes, :type => "map <string, string>" publish :variable => :run_you, :type => "boolean" publish :variable => :flags, :type => "list" - publish :variable => :patterns, :type => "list <string>" publish :variable => :shortlabel, :type => "string" publish :function => :FindBaseProducts, :type => "list <map <string, any>> ()" publish :function => :ReadProducts, :type => "void ()" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.50/library/types/src/Makefile.am new/yast2-3.1.52/library/types/src/Makefile.am --- old/yast2-3.1.50/library/types/src/Makefile.am 2014-04-17 11:18:29.000000000 +0200 +++ new/yast2-3.1.52/library/types/src/Makefile.am 2014-04-22 11:20:27.000000000 +0200 @@ -12,8 +12,8 @@ modules/Integer.rb \ modules/Punycode.rb \ modules/Hostname.rb \ - modules/URLRecode.pm + modules/URLRecode.rb EXTRA_DIST = $(module_DATA) -include $(top_srcdir)/Makefile.am.common \ No newline at end of file +include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.50/library/types/src/modules/URLRecode.pm new/yast2-3.1.52/library/types/src/modules/URLRecode.pm --- old/yast2-3.1.50/library/types/src/modules/URLRecode.pm 2014-04-17 11:18:29.000000000 +0200 +++ new/yast2-3.1.52/library/types/src/modules/URLRecode.pm 1970-01-01 01:00:00.000000000 +0100 @@ -1,87 +0,0 @@ -#!/usr/bin/perl -w -# -# Author: Ladislav Slezák <lslezak@novell.com> -# -# $Id$ -# -# URLRecode.pm -# -# This is a replacement for URI::Encode perl module which cannot be used in inst-sys -# and to decrease the package dependencies -# - -package URLRecode; - -use strict; -use YaST::YCP qw(:LOGGING Boolean sformat);; - -our %TYPEINFO; -use strict; - -# local cache for char -> hex string conversion -our %escape_cache; - -# fill the cache -sub InitCache -{ - for(0..255) {$escape_cache{chr($_)} = sprintf("%%%02x", $_);} -} - - -# Escape password, user name and fragment part of URL string -# @param input input string -# @return string Escaped string -BEGIN{ $TYPEINFO{EscapePassword} = ["function", "string", "string"];} -sub EscapePassword -{ - my ($self, $escaped) = @_; - - if (!%escape_cache) { InitCache(); } - - $escaped =~ s/([^-A-Za-z0-9_.!~*'()])/$escape_cache{$1}/ge; - return $escaped; -} - -# Escape path part of URL string -# @param input input string -# @return string Escaped string -BEGIN{ $TYPEINFO{EscapePath} = ["function", "string", "string"];} -sub EscapePath -{ - my ($self, $escaped) = @_; - - if (!%escape_cache) { InitCache() }; - - $escaped =~ s/([^-A-Za-z0-9_.!~*'()\/])/$escape_cache{$1}/ge; - return $escaped; -} - -# Escape query part of URL string -# @param input input string -# @return string Escaped string -BEGIN{ $TYPEINFO{EscapeQuery} = ["function", "string", "string"];} -sub EscapeQuery -{ - my ($self, $escaped) = @_; - - if (!%escape_cache) { InitCache(); } - - $escaped =~ s/([^-A-Za-z0-9_.!~*'()\/:=&])/$escape_cache{$1}/ge; - return $escaped; -} - - -# UnEscape an URL string, replace %<Hexnum><HexNum> sequences -# by character -# @param input input string -# @return string Unescaped string -BEGIN{ $TYPEINFO{UnEscape} = ["function", "string", "string"];} -sub UnEscape -{ - my ($self, $input) = @_; - - $input =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/ge; - return $input -} - -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.50/library/types/src/modules/URLRecode.rb new/yast2-3.1.52/library/types/src/modules/URLRecode.rb --- old/yast2-3.1.50/library/types/src/modules/URLRecode.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.52/library/types/src/modules/URLRecode.rb 2014-04-22 11:20:27.000000000 +0200 @@ -0,0 +1,62 @@ +# encoding: utf-8 + +# Copyright 2014 SUSE, LLC + +require "yast" + +module Yast + # A drop-in replacement of an earlier Perl implementation + class URLRecodeClass < Module + # these will be substituted to a regex character class + USERNAME_PASSWORD_FRAGMENT_SAFE_CHARS = "-A-Za-z0-9_.!~*'()" + PATH_SAFE_CHARS = "-A-Za-z0-9_.!~*'()/" + QUERY_SAFE_CHARS = "-A-Za-z0-9_.!~*'()/:=&" + + # Escape password, user name and fragment part of URL string + # @param [String] input input string + # @return [String] Escaped string + def EscapePassword(input) + escape(input, USERNAME_PASSWORD_FRAGMENT_SAFE_CHARS) + end + + # Escape path part of URL string + # @param [String] input input string + # @return [String] Escaped string + def EscapePath(input) + escape(input, PATH_SAFE_CHARS) + end + + # Escape path part of URL string + # @param [String] input input string + # @return [String] Escaped string + def EscapeQuery(input) + escape(input, QUERY_SAFE_CHARS) + end + + # UnEscape an URL string, replace %<Hexnum><HexNum> sequences + # by character + # @param [String] input input string + # @return [String] Unescaped string + def UnEscape(input) + input.gsub(/%([0-9A-Fa-f]{2})/) { $1.to_i(16).chr }.force_encoding(input.encoding) + end + + private + + def escape(input, safe_chars) + return nil if input.nil? + input.gsub(/[^#{safe_chars}]/) do |unicode_char| + escaped = "" + unicode_char.each_byte {|b| escaped << sprintf("%%%02x", b) } + escaped + end + end + + publish :function => :EscapePassword, :type => "string (string)" + publish :function => :EscapePath, :type => "string (string)" + publish :function => :EscapeQuery, :type => "string (string)" + publish :function => :UnEscape, :type => "string (string)" + end + + URLRecode = URLRecodeClass.new +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.50/package/yast2.changes new/yast2-3.1.52/package/yast2.changes --- old/yast2-3.1.50/package/yast2.changes 2014-04-17 11:18:29.000000000 +0200 +++ new/yast2-3.1.52/package/yast2.changes 2014-04-22 11:20:27.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Tue Apr 22 11:03:21 CEST 2014 - locilka@suse.com + +- Removed Product.patterns (replaced by Packages.default_patterns) + (bnc#873923) +- 3.1.52 + +------------------------------------------------------------------- +Thu Apr 17 15:08:41 UTC 2014 - mvidner@suse.com + +- rewrote URLRecode.pm to URLRecode.rb so that 'yast2 repositories' + can run without Perl bindings +- 3.1.51 + +------------------------------------------------------------------- Thu Apr 17 11:11:01 CEST 2014 - locilka@suse.com - Decreased number of logs coming from Hooks (to enhance logs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.50/package/yast2.spec new/yast2-3.1.52/package/yast2.spec --- old/yast2-3.1.50/package/yast2.spec 2014-04-17 11:18:29.000000000 +0200 +++ new/yast2-3.1.52/package/yast2.spec 2014-04-22 11:20:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.50 +Version: 3.1.52 Release: 0 URL: https://github.com/yast/yast-yast2 continue with "q"... Checked in at Tue Apr 22 12:34:34 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
ro