packages: builder - -sp (skip patch) support, conflicting one renamed to -l...

[glen]

Author: glen                         Date: Sun Dec 12 20:04:03 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- -sp (skip patch) support, conflicting one renamed to -lsp (list source paths)

---- Files affected:
packages:
   builder (1.640 -> 1.641) 

---- Diffs:

================================================================
Index: packages/builder
diff -u packages/builder:1.640 packages/builder:1.641
--- packages/builder:1.640	Wed Dec  8 23:36:08 2010
+++ packages/builder	Sun Dec 12 21:03:54 2010
@@ -342,7 +342,7 @@
 -sf, --source-files - list sources - bare filenames (intended for offline
                       operations; does not work when Icon field is present
                       but icon file is absent),
--sp, --source-paths - list sources - filenames with full local paths (intended for
+-lsp, --source-paths - list sources - filenames with full local paths (intended for
                       offline operations; does not work when Icon field is present
                       but icon file is absent),
 -su, --source-urls  - list urls - urls to sources and patches
@@ -373,8 +373,10 @@
 -U, --update        - refetch sources, don't use distfiles, and update md5 comments
 -Upi, --update-poldek-indexes
                     - refresh or make poldek package index files.
+-sp, --skip-patch <patchnumber>
+                    - don't apply <patchnumber>. may be repeated.
 -np, --nopatch <patchnumber>
-                    - don't apply <patchnumber>
+                    - abort instead of applying patch <patchnumber>
 --show-bconds       - show available conditional builds, which can be used
                     - with --with and/or --without switches.
 --show-bcond-args   - show active bconds, from ~/.bcondrc. this is used by
@@ -2228,6 +2230,8 @@
 			shift; RPMOPTS="${RPMOPTS} ${1}"; shift ;;
 		--nopatch | -np )
 			shift; RPMOPTS="${RPMOPTS} --define \"patch${1} : ignoring patch${1}; exit 1; \""; shift ;;
+		--skip-patch | -sp )
+			shift; RPMOPTS="${RPMOPTS} --define \"patch${1} : skiping patch${1}\""; shift ;;
 		--topdir)
 			RPMOPTS="${RPMOPTS} --define \"_topdir $2\""
 			shift 2
@@ -2292,7 +2296,7 @@
 		-sf | --sources-files)
 			COMMAND="list-sources-files"
 			shift ;;
-		-sp | --sources-paths)
+		-lsp | --sources-paths)
 			COMMAND="list-sources-local-paths"
 			shift ;;
 		-su | --sources-urls)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/builder?r1=1.640&r2=1.641&f=u