[PATCH] two patches for scripts/makeupdates

[PATCH 1/2] Include changed files from the top level in the updates.

[David Lehman]

---
 scripts/makeupdates |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/scripts/makeupdates b/scripts/makeupdates
index a8947ed..c6c663d 100755
--- a/scripts/makeupdates
+++ b/scripts/makeupdates
@@ -113,6 +113,9 @@ def copyUpdatedFiles(tag, updates, cwd):
             else:
                 sys.stdout.write("Including %s\n" % (file,))
                 shutil.copy2(file, updates)
+        else:
+            sys.stdout.write("Including %s\n" % (file,))
+            shutil.copy2(file, updates)

def isysChanged(tag):
     lines = doGitDiff(tag, ['isys'])

[PATCH 2/2] Add support for specifying a tag to makeupdates.

[David Lehman]

---
 scripts/makeupdates |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/makeupdates b/scripts/makeupdates
index c6c663d..338e44f 100755
--- a/scripts/makeupdates
+++ b/scripts/makeupdates
@@ -166,10 +166,11 @@ def main(argv):
     spec = os.path.realpath(cwd + '/anaconda.spec.in')
     updates = cwd + '/updates'
     keep, compile, help, unknown = False, False, False, False
+    tag = None

try:
-        opts, args = getopt.getopt(sys.argv[1:], 'kc?',
-                                   ['keep', 'compile', 'help'])
+        opts, args = getopt.getopt(sys.argv[1:], 't:kc?',
+                                   ['tag=', 'keep', 'compile', 'help'])
     except getopt.GetoptError:
         help = True

@@ -180,6 +181,8 @@ def main(argv):
             compile = True
         elif o in ('-?', '--help'):
             help = True
+        elif o in ('-t', '--tag'):
+            tag = a
         else:
             unknown = True

@@ -195,7 +198,8 @@ def main(argv):
         sys.stderr.write("You must be at the top level of the anaconda source tree.\n")
         sys.exit(1)

-    tag = getArchiveTag(configure, spec)
+    if not tag:
+        tag = getArchiveTag(configure, spec)

if not os.path.isdir(updates):
         os.makedirs(updates)

[David Cantrell]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Mon, 10 Aug 2009, David Lehman wrote:
> Anaconda-devel-list mailing list
> [e-mail]
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list

Both look fine.

- -- 
David Cantrell 
Red Hat / Honolulu, HI
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.9 (GNU/Linux)
>
> iEYEARECAAYFAkqAk6oACgkQ5hsjjIy1Vkn8LwCg2CAOcYXy4AXSLO8jK7K7KWnH
> A1EAn1FQrj3kxGNjMpdiZvbbjVb9oJ+3
> =FbHI
> -----END PGP SIGNATURE-----