[gentoo-commits] proj/elfix:master commit in: scripts/, misc/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     7da069f24f757a892492d3639bd253106c3b8a05
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 01:29:13 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 03:48:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=7da069f2

scripts/migrate-pax, misc/alt-revdep-pax: immediately bail if we are not root

---
 misc/alt-revdep-pax |    6 ++++++
 scripts/migrate-pax |   12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/misc/alt-revdep-pax b/misc/alt-revdep-pax
index 58fba3c..b46fe23 100755
--- a/misc/alt-revdep-pax
+++ b/misc/alt-revdep-pax
@@ -523,6 +523,12 @@ def run_usage():
 
 
 def main():
+	# Are we root?
+	uid = os.getuid()
+	if uid != 0:
+		print('This program must be run as root')
+		sys.exit(1)
+
 	try:
 		opts, args = getopt.getopt(sys.argv[1:], 'hfrb:s:l:vemy')
 	except getopt.GetoptError as err:

diff --git a/scripts/migrate-pax b/scripts/migrate-pax
index 1d5c2f7..09a41e2 100755
--- a/scripts/migrate-pax
+++ b/scripts/migrate-pax
@@ -55,6 +55,12 @@ def run_usage():
 
 
 def main():
+	# Are we root?
+	uid = os.getuid()
+	if uid != 0:
+		print('This program must be run as root')
+		sys.exit(1)
+
 	try:
 		opts, args = getopt.getopt(sys.argv[1:], 'vmdh')
 	except getopt.GetoptError as err:
@@ -95,12 +101,6 @@ def main():
 		run_usage()
 		sys.exit(1)
 
-	# Are we root?
-	uid = os.getuid()
-	if uid != 0 and do_migration:
-		print('RUN AS ROOT: cannot migrate flags')
-		sys.exit(1)
-
 	# Do we have XATTR_PAX support?
 	if do_migration or do_deleteall:
 		try: