Skip to contentSkip to conversation

ckptinfo.py: revert commit 8f99ace6513f958d572ef690d7af111991124f5c

PATCH In review Oren Laadan 2 participants 3 messages Sep 23, 2009 – Sep 24, 2009 2 messages not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ckptinfo.py: revert commit 8f99ace6513f958d572ef690d7af111991124f5c

Said commit "slightly" broke 'ckptinfo -ve', causing it to produce only "--UNKNOWN--" objects.

---
 ckptinfo.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
ckptinfo.py +1 -1
index add73cb..1c98569 100755
@@ -42,7 +42,7 @@ char *%s_to_str(int type)
 	switch (type) {
 """ % type
     for key in list:
-        print "#ifdef CKPT_%s\n\tcase CKPT_%s: return \"%s\";\n#endif" % (key, key, key)
+        print "\tcase CKPT_%s: return \"%s\";\n" % (key, key)
 
     print """
 	}
Signature · 1 line
1.6.0.4

A message that is not in the archive (sent off-list or not yet received): 1253665010-3472-1-git-send-email-orenl-RdfvBDnrOixBDgjK7y7TUQ@public.gmane.org

Acked-by
#2 lore raw
Quoted 4 lines · Oren Laadan

Said commit "slightly" broke 'ckptinfo -ve', causing it to produce only "--UNKNOWN--" objects.

This one's my fault. In case you haven't already applied the reverted patch... I've got an alternate solution rolled in with my "extract kernel headers" branch which I should be able to post after I get the epoll patches posted.

Quoted 24 lines
---
 ckptinfo.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
ckptinfo.py +1 -1
index add73cb..1c98569 100755
@@ -42,7 +42,7 @@ char *%s_to_str(int type)
 	switch (type) {
 """ % type
     for key in list:
-        print "#ifdef CKPT_%s\n\tcase CKPT_%s: return \"%s\";\n#endif" % (key, key, key)
+        print "\tcase CKPT_%s: return \"%s\";\n" % (key, key)
 
     print """
 	}
Signature · 6 lines
1.6.0.4

_______________________________________________
Containers mailing list
Containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
https://lists.linux-foundation.org/mailman/listinfo/containers

A message that is not in the archive (sent off-list or not yet received): 20090923215343.GB6876-52DBMbEzqgQ/wnmkkaCWp/[email protected]

#4 lore raw
Quoted 4 lines · Matt Helsley
Quoted 3 lines · Oren Laadan

Said commit "slightly" broke 'ckptinfo -ve', causing it to produce only "--UNKNOWN--" objects.

Quoted 8 lines
Quoted 1 line

This one's my fault. In case you haven't already applied the reverted patch... I've got an alternate solution rolled in with my "extract kernel headers" branch which I should be able to post after I get the epoll patches posted.

It's in ckpt-v18. Improvements always welcome :)

Oren.

Quoted 25 lines
Quoted 25 lines
---
 ckptinfo.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
ckptinfo.py +1 -1
index add73cb..1c98569 100755
@@ -42,7 +42,7 @@ char *%s_to_str(int type)
 	switch (type) {
 """ % type
     for key in list:
-        print "#ifdef CKPT_%s\n\tcase CKPT_%s: return \"%s\";\n#endif" % (key, key, key)
+        print "\tcase CKPT_%s: return \"%s\";\n" % (key, key)
 
     print """
 	}
Signature · 6 lines
1.6.0.4

_______________________________________________
Containers mailing list
Containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
https://lists.linux-foundation.org/mailman/listinfo/containers