Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2015-11-24 22:32:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint (Old) and /work/SRC/openSUSE:Factory/.rpmlint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmlint" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint-tests.changes 2015-11-15 12:45:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint-tests.changes 2015-11-24 22:32:36.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 13 12:27:11 UTC 2015 - lnus...@suse.de + +- Update to version 13.2+git20151113.ff9879a: + + adjust for tmpfiles fix + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2015-11-15 12:45:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2015-11-24 22:32:36.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 13 12:24:38 UTC 2015 - lnus...@suse.de + +- fix TmpFilesCheck not finding pattern in the full script + (fix-TmpFilesCheck-pattern-match.diff) + +------------------------------------------------------------------- Old: ---- rpmlint-tests-13.2+git20151110.e8d6260.tar.xz New: ---- fix-TmpFilesCheck-pattern-match.diff rpmlint-tests-13.2+git20151113.ff9879a.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint-tests.spec ++++++ --- /var/tmp/diff_new_pack.IYZiYR/_old 2015-11-24 22:32:38.000000000 +0100 +++ /var/tmp/diff_new_pack.IYZiYR/_new 2015-11-24 22:32:38.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: rpmlint-mini Name: rpmlint-tests -Version: 13.2+git20151110.e8d6260 +Version: 13.2+git20151113.ff9879a Release: 0 Summary: rpmlint regression tests License: SUSE-Public-Domain ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.IYZiYR/_old 2015-11-24 22:32:38.000000000 +0100 +++ /var/tmp/diff_new_pack.IYZiYR/_new 2015-11-24 22:32:38.000000000 +0100 @@ -110,8 +110,9 @@ Patch52: fix-ghost-file-handling.diff Patch53: remove-files-attr-not-set-check.diff Patch54: move-ghost-file-check-to-TmpFilesCh.diff +Patch55: fix-TmpFilesCheck-pattern-match.diff # PATCHLIST END -# BuildArch must at the and. is a bug: https://bugzilla.suse.com/show_bug.cgi?id=926766 +# BuildArch must at the end. is a bug: https://bugzilla.suse.com/show_bug.cgi?id=926766 BuildArch: noarch %py_requires ++++++ README.packaging.txt ++++++ --- /var/tmp/diff_new_pack.IYZiYR/_old 2015-11-24 22:32:38.000000000 +0100 +++ /var/tmp/diff_new_pack.IYZiYR/_new 2015-11-24 22:32:38.000000000 +0100 @@ -1,3 +1,10 @@ += rpmlint = + +The patches for rpmlint can be managed in git. That is especially +useful when rebasing to a new rpmlint version. Read update_git.sh + += rpmlint-checks, rpmlint-tests = + The files from rpmlint-checks and rpmlint-tests managed in git. If you need to make changes, you have the following options: * Make them in git and update the package from git (you can file ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.IYZiYR/_old 2015-11-24 22:32:38.000000000 +0100 +++ /var/tmp/diff_new_pack.IYZiYR/_new 2015-11-24 22:32:38.000000000 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">http://github.com/openSUSE/rpmlint-tests.git</param> - <param name="changesrevision">e8d62606360ce2fdd5c8e19bb83d21c04ef3c883</param></service><service name="tar_scm"> + <param name="changesrevision">ff9879acb697f55844553e6865366fc6d029b546</param></service><service name="tar_scm"> <param name="url">http://github.com/openSUSE/rpmlint-checks.git</param> <param name="changesrevision">d0808a2802827878acce9ea1e7a1c6226ac79f95</param></service></servicedata> \ No newline at end of file ++++++ fix-TmpFilesCheck-pattern-match.diff ++++++ From: Ludwig Nussel <ludwig.nus...@suse.de> Date: Fri, 13 Nov 2015 12:56:25 +0100 Subject: [PATCH] fix TmpFilesCheck pattern match need to use search() instead of match() find the systemd-tmpfiles call --- TmpFilesCheck.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TmpFilesCheck.py b/TmpFilesCheck.py index 06be7bb..d1ef824 100644 --- a/TmpFilesCheck.py +++ b/TmpFilesCheck.py @@ -43,8 +43,8 @@ class TmpFilesCheck(AbstractCheck.AbstractCheck): continue pattern = re.compile(r'systemd-tmpfiles --create .*%s'%re.escape(fn)) - if (not postin or not pattern.match(postin)) and \ - (not prein or not pattern.match(prein)): + if (not postin or not pattern.search(postin)) and \ + (not prein or not pattern.search(prein)): printWarning(pkg, 'postin-without-tmpfile-creation', fn) ++++++ rpmlint-tests-13.2+git20151110.e8d6260.tar.xz -> rpmlint-tests-13.2+git20151113.ff9879a.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-13.2+git20151110.e8d6260/tests/tmpfiles4.ref new/rpmlint-tests-13.2+git20151113.ff9879a/tests/tmpfiles4.ref --- old/rpmlint-tests-13.2+git20151110.e8d6260/tests/tmpfiles4.ref 2015-05-20 10:02:15.000000000 +0200 +++ new/rpmlint-tests-13.2+git20151113.ff9879a/tests/tmpfiles4.ref 2015-11-13 13:27:10.000000000 +0100 @@ -1,2 +1 @@ -tmpfiles4: W: postin-without-tmpfile-creation /usr/lib/tmpfiles.d/foo.conf -1 packages and 0 specfiles checked; 0 errors, 1 warnings. +1 packages and 0 specfiles checked; 0 errors, 0 warnings. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-13.2+git20151110.e8d6260/tests/tmpfiles4.spec new/rpmlint-tests-13.2+git20151113.ff9879a/tests/tmpfiles4.spec --- old/rpmlint-tests-13.2+git20151110.e8d6260/tests/tmpfiles4.spec 2015-05-20 10:02:15.000000000 +0200 +++ new/rpmlint-tests-13.2+git20151113.ff9879a/tests/tmpfiles4.spec 2015-11-13 13:27:10.000000000 +0100 @@ -31,6 +31,9 @@ %clean rm -rf %buildroot +%post +%tmpfiles_create %_tmpfilesdir/foo.conf + %files %defattr(-,root,root) /usr/lib/tmpfiles.d ++++++ update_git.sh ++++++ --- /var/tmp/diff_new_pack.IYZiYR/_old 2015-11-24 22:32:39.000000000 +0100 +++ /var/tmp/diff_new_pack.IYZiYR/_new 2015-11-24 22:32:39.000000000 +0100 @@ -30,6 +30,8 @@ GIT_DIR=`mktemp -d --tmpdir update_git.XXXXXXXXXX` CMP_DIR=`mktemp -d --tmpdir update_git.XXXXXXXXXX` +rm -f .update_git.* + if [ -d "$GIT_LOCAL_TREE" ]; then echo "Processing $GIT_BRANCH branch of local git tree, using tag:" \ "$GIT_UPSTREAM_TAG" @@ -87,7 +89,7 @@ else mv "$CMP_DIR/$newname" "$localname" let ADDED_COUNT+=1 - echo " $localname" >> qemu.changes.added + echo " $localname" >> .update_git.changes.added osc add "$localname" fi done @@ -104,7 +106,7 @@ if [ -z "$keep" ]; then osc rm --force $patch let DELETED_COUNT+=1 - echo " $patch" >> qemu.changes.deleted + echo " $patch" >> .update_git.changes.deleted fi done @@ -128,25 +130,20 @@ done < $package.spec > $package.spec.new mv $package.spec.new $package.spec - if [ -e qemu.changes.deleted ]; then + if [ -e .update_git.changes.deleted ]; then echo "* Patches dropped:" >> $package.changes.proposed - cat qemu.changes.deleted >> $package.changes.proposed + cat .update_git.changes.deleted >> $package.changes.proposed fi - if [ -e qemu.changes.added ]; then + if [ -e .update_git.changes.added ]; then echo "* Patches added:" >> $package.changes.proposed - cat qemu.changes.added >> $package.changes.proposed + cat .update_git.changes.added >> $package.changes.proposed fi if [ -e $package.changes.proposed ]; then osc vc --file=$package.changes.proposed $package rm -f $package.changes.proposed fi done -if [ -e qemu.changes.deleted ]; then - rm -f qemu.changes.deleted -fi -if [ -e qemu.changes.added ]; then - rm -f qemu.changes.added -fi +rm -f .update_git.* echo "git patch summary" echo " unchanged: $UNCHANGED_COUNT" echo " changed: $CHANGED_COUNT"
