Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 15984 Details for
Bug 14079
Python replacement for etc-update
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
dispatch-conf-2.0.49_pre17-merge_fixes.patch
dispatch-conf-2.0.49_pre17-merge_fixes.patch (text/plain), 2.27 KB, created by
Max Kalika (RETIRED)
on 2003-08-12 10:20:51 UTC
(
hide
)
Description:
dispatch-conf-2.0.49_pre17-merge_fixes.patch
Filename:
MIME Type:
Creator:
Max Kalika (RETIRED)
Created:
2003-08-12 10:20:51 UTC
Size:
2.27 KB
patch
obsolete
>--- dispatch-conf 2003-08-12 08:38:10.000000000 -0700 >+++ dispatch-conf 2003-08-12 10:14:47.000000000 -0700 >@@ -20,6 +20,7 @@ > DIFF_CONTENTS = 'diff -Nau %s %s' > DIFF_CVS_INTERP = 'diff -Nau %s %s | grep "^[+-][^+-]" | grep -v "# .Header:.*"' > DIFF_WSCOMMENTS = 'diff -Nau %s %s | grep "^[+-][^+-]" | grep -v "^[-+]#" | grep -v "^[-+][:space:]*$"' >+MKTEMP = 'mktemp /tmp/dispatch-conf.merged.%i.XXXXXX' > MERGE = 'sdiff --suppress-common-lines --output=%s %s %s' > > MANDATORY_OPTS = [ 'archive-dir', 'diff', 'pager', 'replace-cvs', 'replace-wscomments' ] >@@ -95,10 +96,10 @@ > elif c == 'n': > break > elif c == 'f': >- merged = '/tmp/dispatch-conf.merged.%i' % (os.getpid (),) >+ merged = commands.getoutput (MKTEMP % (os.getpid ())) > print > os.system (MERGE % (merged, conf ['current'], conf ['new'])) >- os.rename (merged, conf ['new']) >+ self.replace (merged, conf ['new']) > continue > elif c == 'k': > os.remove (conf ['new']) >@@ -132,11 +133,18 @@ > except (IOError, os.error), why: > print >> sys.stderr, 'dispatch-conf: Error copying %s to %s: %s; fatal' % \ > (curconf, archive, str(why)) >+ >+ # this should be changed to shutil.move() when we move to python 2.3 > try: >- os.rename (newconf, curconf) >+ shutil.copy2 (newconf, curconf) > except (IOError, os.error), why: >- print >> sys.stderr, 'dispatch-conf: Error renaming %s to %s: %s; fatal' % \ >+ print >> sys.stderr, 'dispatch-conf: Error copying %s to %s: %s; fatal' % \ > (newconf, curconf, str(why)) >+ try: >+ os.unlink (newconf) >+ except (IOError, os.error), why: >+ print >> sys.stderr, 'dispatch-conf: Error removing %s: %s; fatal' % \ >+ (newconf, str(why)) > break > else: > print >> sys.stderr, 'dispatch-conf: Error archiving files -- exhausted slots???; fatal'
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 14079
:
7390
|
7391
|
8103
|
8364
|
8575
|
8589
|
8593
|
8602
|
8624
|
8625
|
8633
| 15984 |
16059
|
17243
|
17602
|
17603
|
21970