ALT Linux Team development discussions
 help / color / mirror / Atom feed
* [devel] Опция --local для gear
@ 2006-05-12 10:59 Kirill A. Shutemov
  2006-05-12 11:02 ` Alexey I. Froloff
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Kirill A. Shutemov @ 2006-05-12 10:59 UTC (permalink / raw)
  To: ALT Devel discussion list


[-- Attachment #1.1: Type: text/plain, Size: 352 bytes --]

патч в аттаче

-- 
Kirill A. Shutemov				Belarus, Minsk
E-mail:	k.shutemov (AT) sam-solutions.net
JID: kas (AT) altlinux.org
ICQ: 152302675

>Подскажи те что может быть с firefox'ом
>после одного из обновления (dist-upgrade) firefox перестал запускаться,
>точнее отображать окно
Можно еще точнее описать проблему?
		-- legion in sisyphus@

[-- Attachment #1.2: 0001-Option-local-added.txt --]
[-- Type: text/plain, Size: 2589 bytes --]

From nobody Mon Sep 17 00:00:00 2001
From: Kirill A. Shutemov <kas@pc152.sam-solutions.net>
Date: Fri, 12 May 2006 13:49:51 +0300
Subject: [PATCH] Option --local added

---

 gear |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

4b3aee96f66d2517c28f3109820ab89ef7b314ae
diff --git a/gear b/gear
index 87b69e9..a53a86d 100755
--- a/gear
+++ b/gear
@@ -109,6 +109,7 @@ Options:
   --export-dir=DIRNAME      write source files to specified directory;
   -r, --rules=FILENAME      name of file with rules, default is .$PROG-rules;
   -t, --tree-ish=ID         tree, commit or tag object name;
+  -l, --local               extract archive from local directory, not from git;
   -q, --quiet               try to be more quiet;
   -v, --verbose             print a message for each action;
   -V, --version             print program version and exit;
@@ -124,6 +125,10 @@ tmpdir=
 exit_handler()
 {
 	local rc=$?
+	if [ -n "$local" ]; then
+	    git-reset --soft HEAD^
+	fi
+
 	trap - EXIT
 	[ -z "$tmpdir" ] || rm -rf -- "$tmpdir"
 	exit $rc
@@ -432,7 +437,6 @@ parse_rules()
 
 	lineno=0
 	local cmd options
-	echo >>"$workdir/rules"
 	while read -r cmd options; do
 		lineno="$((lineno+1))"
 		case "$cmd" in
@@ -458,7 +462,7 @@ opt_check_dir()
 	printf %s "$value"
 }
 
-TEMP=`getopt -n $PROG -o r:,t:,h,q,v,V -l no-compress,bzip2,gzip,hasher,rpmbuild,export-dir:,rules:,tree-ish:,help,quiet,verbose,version -- "$@"` ||
+TEMP=`getopt -n $PROG -o r:,t:,l,h,q,v,V -l no-compress,bzip2,gzip,hasher,rpmbuild,export-dir:,rules:,tree-ish:,local,help,quiet,verbose,version -- "$@"` ||
 	show_usage
 eval set -- "$TEMP"
 
@@ -468,6 +472,7 @@ outdir=
 rules=".$PROG-rules"
 tar_compress=--gzip
 tree_id=HEAD
+local=
 while :; do
 	case "$1" in
 		--) shift; break
@@ -496,6 +501,8 @@ while :; do
 			;;
 		-t|--tree-ish) shift; tree_id="$1"
 			;;
+		-l|--local) local=1
+			;;
 		-h|--help) show_help
 			;;
 		-q|--quiet) quiet=-q
@@ -528,6 +535,10 @@ else
 	shift
 fi
 
+if [ -n "$local" -a "$tree_id" != 'HEAD' ]; then
+    show_usage 'Options --local is actual only with tree_ish=HEAD.'
+fi
+
 # Check given tree-ish.
 type="$(git-cat-file -t "$tree_id")" ||
 	fatal "Invalid GIT_DIR ($GIT_DIR) or tree-ish ($tree_id)"
@@ -548,6 +559,10 @@ if [ -z "$outdir" ]; then
 	mkdir "$outdir"
 fi
 
+if [ -n "$local" ]; then
+    git-commit -a -m 'temporary commit' > /dev/null || { local=; info 'Nothing changed. Used last commit'; }
+fi
+
 find_specfile
 
 parse_rules
-- 
1.3.2


[-- Attachment #2: Type: application/pgp-signature, Size: 191 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2006-05-16 17:07 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-05-12 10:59 [devel] Опция --local для gear Kirill A. Shutemov
2006-05-12 11:02 ` Alexey I. Froloff
2006-05-12 11:08   ` Kirill A. Shutemov
2006-05-16  7:02 ` Kirill A. Shutemov
2006-05-16 15:43 ` Dmitry V. Levin
2006-05-16 17:07   ` Kirill A. Shutemov

ALT Linux Team development discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
		devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
	public-inbox-index devel

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://lore.altlinux.org/org.altlinux.lists.devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git