mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-31 10:46:16 +00:00
Add a patch to make portupgrade just use stdout/stderr redirection to
keep build logs rather than calling script(1) when stdin is not a tty. I wonder if this works against the portupgrade-from-cron problem...
This commit is contained in:
Akinori MUSHA
parent
2a9911b9a6
commit
2e991b1aa5
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=99628
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= portupgrade
|
||||
PORTVERSION= 20040113
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
|
||||
${MASTER_SITE_LOCAL}
|
||||
|
||||
46
ports-mgmt/portupgrade-devel/files/patch-pkgtools.rb
Normal file
46
ports-mgmt/portupgrade-devel/files/patch-pkgtools.rb
Normal file
@ -0,0 +1,46 @@
|
||||
Index: lib/pkgtools.rb
|
||||
===================================================================
|
||||
RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v
|
||||
retrieving revision 1.116
|
||||
diff -u -r1.116 pkgtools.rb
|
||||
--- lib/pkgtools.rb 19 Oct 2003 11:56:34 -0000 1.116
|
||||
+++ lib/pkgtools.rb 16 Jan 2004 12:11:11 -0000
|
||||
@@ -478,14 +478,20 @@
|
||||
alias system! sudo
|
||||
alias xsystem! xsudo
|
||||
|
||||
-# script, xscript
|
||||
-def __script(x, file, *args)
|
||||
- if file
|
||||
- __system(x, '/usr/bin/script', '-qa', file, *args)
|
||||
+def logged_command(file, args)
|
||||
+ if !file
|
||||
+ args
|
||||
+ elsif STDIN.tty?
|
||||
+ ['/usr/bin/script', '-qa', file, *args]
|
||||
else
|
||||
- __system(x, *args)
|
||||
+ ['/bin/sh', '-c', sprintf('%s >>%s 2>&1', shelljoin(*args), shelljoin(file))]
|
||||
end
|
||||
end
|
||||
+
|
||||
+# script, xscript
|
||||
+def __script(x, file, *args)
|
||||
+ __system(x, *logged_command(file, args))
|
||||
+end
|
||||
def script(file, *args)
|
||||
__script(false, file, *args)
|
||||
end
|
||||
@@ -495,11 +501,7 @@
|
||||
|
||||
# script!, xscript!
|
||||
def __script!(x, file, *args)
|
||||
- if file
|
||||
- __sudo(x, '/usr/bin/script', '-qa', file, *args)
|
||||
- else
|
||||
- __sudo(x, *args)
|
||||
- end
|
||||
+ __sudo(x, *logged_command(file, args))
|
||||
end
|
||||
def script!(file, *args)
|
||||
__script!(false, file, *args)
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= portupgrade
|
||||
PORTVERSION= 20040113
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
|
||||
${MASTER_SITE_LOCAL}
|
||||
|
||||
46
ports-mgmt/portupgrade/files/patch-pkgtools.rb
Normal file
46
ports-mgmt/portupgrade/files/patch-pkgtools.rb
Normal file
@ -0,0 +1,46 @@
|
||||
Index: lib/pkgtools.rb
|
||||
===================================================================
|
||||
RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v
|
||||
retrieving revision 1.116
|
||||
diff -u -r1.116 pkgtools.rb
|
||||
--- lib/pkgtools.rb 19 Oct 2003 11:56:34 -0000 1.116
|
||||
+++ lib/pkgtools.rb 16 Jan 2004 12:11:11 -0000
|
||||
@@ -478,14 +478,20 @@
|
||||
alias system! sudo
|
||||
alias xsystem! xsudo
|
||||
|
||||
-# script, xscript
|
||||
-def __script(x, file, *args)
|
||||
- if file
|
||||
- __system(x, '/usr/bin/script', '-qa', file, *args)
|
||||
+def logged_command(file, args)
|
||||
+ if !file
|
||||
+ args
|
||||
+ elsif STDIN.tty?
|
||||
+ ['/usr/bin/script', '-qa', file, *args]
|
||||
else
|
||||
- __system(x, *args)
|
||||
+ ['/bin/sh', '-c', sprintf('%s >>%s 2>&1', shelljoin(*args), shelljoin(file))]
|
||||
end
|
||||
end
|
||||
+
|
||||
+# script, xscript
|
||||
+def __script(x, file, *args)
|
||||
+ __system(x, *logged_command(file, args))
|
||||
+end
|
||||
def script(file, *args)
|
||||
__script(false, file, *args)
|
||||
end
|
||||
@@ -495,11 +501,7 @@
|
||||
|
||||
# script!, xscript!
|
||||
def __script!(x, file, *args)
|
||||
- if file
|
||||
- __sudo(x, '/usr/bin/script', '-qa', file, *args)
|
||||
- else
|
||||
- __sudo(x, *args)
|
||||
- end
|
||||
+ __sudo(x, *logged_command(file, args))
|
||||
end
|
||||
def script!(file, *args)
|
||||
__script!(false, file, *args)
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= portupgrade
|
||||
PORTVERSION= 20040113
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
|
||||
${MASTER_SITE_LOCAL}
|
||||
|
||||
46
sysutils/portupgrade-devel/files/patch-pkgtools.rb
Normal file
46
sysutils/portupgrade-devel/files/patch-pkgtools.rb
Normal file
@ -0,0 +1,46 @@
|
||||
Index: lib/pkgtools.rb
|
||||
===================================================================
|
||||
RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v
|
||||
retrieving revision 1.116
|
||||
diff -u -r1.116 pkgtools.rb
|
||||
--- lib/pkgtools.rb 19 Oct 2003 11:56:34 -0000 1.116
|
||||
+++ lib/pkgtools.rb 16 Jan 2004 12:11:11 -0000
|
||||
@@ -478,14 +478,20 @@
|
||||
alias system! sudo
|
||||
alias xsystem! xsudo
|
||||
|
||||
-# script, xscript
|
||||
-def __script(x, file, *args)
|
||||
- if file
|
||||
- __system(x, '/usr/bin/script', '-qa', file, *args)
|
||||
+def logged_command(file, args)
|
||||
+ if !file
|
||||
+ args
|
||||
+ elsif STDIN.tty?
|
||||
+ ['/usr/bin/script', '-qa', file, *args]
|
||||
else
|
||||
- __system(x, *args)
|
||||
+ ['/bin/sh', '-c', sprintf('%s >>%s 2>&1', shelljoin(*args), shelljoin(file))]
|
||||
end
|
||||
end
|
||||
+
|
||||
+# script, xscript
|
||||
+def __script(x, file, *args)
|
||||
+ __system(x, *logged_command(file, args))
|
||||
+end
|
||||
def script(file, *args)
|
||||
__script(false, file, *args)
|
||||
end
|
||||
@@ -495,11 +501,7 @@
|
||||
|
||||
# script!, xscript!
|
||||
def __script!(x, file, *args)
|
||||
- if file
|
||||
- __sudo(x, '/usr/bin/script', '-qa', file, *args)
|
||||
- else
|
||||
- __sudo(x, *args)
|
||||
- end
|
||||
+ __sudo(x, *logged_command(file, args))
|
||||
end
|
||||
def script!(file, *args)
|
||||
__script!(false, file, *args)
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= portupgrade
|
||||
PORTVERSION= 20040113
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
|
||||
${MASTER_SITE_LOCAL}
|
||||
|
||||
46
sysutils/portupgrade/files/patch-pkgtools.rb
Normal file
46
sysutils/portupgrade/files/patch-pkgtools.rb
Normal file
@ -0,0 +1,46 @@
|
||||
Index: lib/pkgtools.rb
|
||||
===================================================================
|
||||
RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v
|
||||
retrieving revision 1.116
|
||||
diff -u -r1.116 pkgtools.rb
|
||||
--- lib/pkgtools.rb 19 Oct 2003 11:56:34 -0000 1.116
|
||||
+++ lib/pkgtools.rb 16 Jan 2004 12:11:11 -0000
|
||||
@@ -478,14 +478,20 @@
|
||||
alias system! sudo
|
||||
alias xsystem! xsudo
|
||||
|
||||
-# script, xscript
|
||||
-def __script(x, file, *args)
|
||||
- if file
|
||||
- __system(x, '/usr/bin/script', '-qa', file, *args)
|
||||
+def logged_command(file, args)
|
||||
+ if !file
|
||||
+ args
|
||||
+ elsif STDIN.tty?
|
||||
+ ['/usr/bin/script', '-qa', file, *args]
|
||||
else
|
||||
- __system(x, *args)
|
||||
+ ['/bin/sh', '-c', sprintf('%s >>%s 2>&1', shelljoin(*args), shelljoin(file))]
|
||||
end
|
||||
end
|
||||
+
|
||||
+# script, xscript
|
||||
+def __script(x, file, *args)
|
||||
+ __system(x, *logged_command(file, args))
|
||||
+end
|
||||
def script(file, *args)
|
||||
__script(false, file, *args)
|
||||
end
|
||||
@@ -495,11 +501,7 @@
|
||||
|
||||
# script!, xscript!
|
||||
def __script!(x, file, *args)
|
||||
- if file
|
||||
- __sudo(x, '/usr/bin/script', '-qa', file, *args)
|
||||
- else
|
||||
- __sudo(x, *args)
|
||||
- end
|
||||
+ __sudo(x, *logged_command(file, args))
|
||||
end
|
||||
def script!(file, *args)
|
||||
__script!(false, file, *args)
|
||||
Loading…
Reference in New Issue
Block a user