Forráskód Böngészése

use a cruel workaround until I know how to solve it more clean: skip .snap (FreeBSD 5) and .snapshot (NetApp) directories in *.rpmxxx checking inside the run-command processor

Ralf S. Engelschall 21 éve
szülő
commit
3e8d6a64b5
3 módosított fájl, 3 hozzáadás és 2 törlés
  1. 1 0
      openpkg/HISTORY
  2. 1 1
      openpkg/openpkg.spec
  3. 1 1
      openpkg/rc

+ 1 - 0
openpkg/HISTORY

@@ -2,6 +2,7 @@
 2004
 ====
 
+20040505 rc: skip .snap (FreeBSD 5) and .snapshot (NetApp) directories in *.rpmxxx checking
 20040501 use better GCC detection in "rpmtool cflags" (taken over from "gcc" package)
 20040429 make sure <prefix>/etc/rc does not complain in cronjobs of non-privileged setups
 20040429 port to NetBSD 1.6.2

+ 1 - 1
openpkg/openpkg.spec

@@ -39,7 +39,7 @@
 #   o any cc(1)
 
 #   the package version/release
-%define       V_openpkg  20040501
+%define       V_openpkg  20040505
 
 #   the used software versions
 %define       V_rpm      4.2.1

+ 1 - 1
openpkg/rc

@@ -292,7 +292,7 @@ for cmd in $cmds; do
 
         #   check for upgraded package with unresolved configuration file conflicts
         if [ -d "$prefix/etc/$s_name" -a ".$eval" != .1 ]; then
-            if [ ".`find $prefix/etc/$s_name -print 2>/dev/null | egrep '.*\.rpm(new|orig|save)$'`" != . ]; then
+            if [ ".`find $prefix/etc/$s_name -type f -print 2>/dev/null | egrep -v '.*/\.(snap|snapshot)/.*' | egrep '.*\.rpm(new|orig|save)$'`" != . ]; then
                 case "$cmd" in
                     start|restart ) type="ERROR"   ;;
                     * )             type="WARNING" ;;