]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
Merge branch 'perl' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 11 Oct 2010 19:24:18 +0000 (21:24 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 11 Oct 2010 19:24:18 +0000 (21:24 +0200)
1  2 
naoki/constants.py
tools/packager

Simple merge
diff --cc tools/packager
index 67e91b11513525787959ecce7d1eb8cb30c8e81b,c1c07ff11b39fc0894a396da131ed388e89ef1bf..c998780d898c7e24cbe679ce40d7618ecc579869
@@@ -162,22 -131,19 +162,22 @@@ function __filelist() 
        # Enable globbing again
        set +f
  
-       # If not paths were found take all files
-       [ -z "${paths}" ] && paths="${BUILDROOT}"
+       # If not paths were found -> break
+       [ -z "${paths}" ] && return
  
 -      for file in $(find ${paths} 2>/dev/null | sort); do
 -              # Remove ${BUILDROOT}
 -              file="${file#${BUILDROOT}}"
 -
 -              # Remove all leading slashes
 -              while [ "${file:0:1}" = "/" ]; do
 -                      file="${file:1:${#file}}"
 -              done
 +      local excludes
 +      if [ -n "${exclude_paths}" ]; then
 +              excludes=$(find_files ${exclude_paths})
 +      fi
  
 -              echo "${file}"
 +      for file in $(find_files ${paths}); do
 +              if [ -n "${excludes}" ]; then
 +                      if ! listmatch ${file} ${excludes}; then
 +                              echo "${file}"
 +                      fi
 +              else
 +                      echo "${file}"
 +              fi
        done
  }